gtk+-3.0: correct Plug and Socket to use X.Window where necessary

Fixes bug 656049.

diff --git a/vapi/gtk+-3.0.deps b/vapi/gtk+-3.0.deps
index 1b560e0d5a28e2f796369418e29460b2ad0f0c91..822b12ba2a42b4ddeff9dcd3e99ab17424fd1cc0 100644 (file)
--- a/vapi/gtk+-3.0.deps
+++ b/vapi/gtk+-3.0.deps
@@ -4,3 +4,4 @@ cairo
 gdk-pixbuf-2.0
 gdk-3.0
 pango
+x11

diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 5fa940a8c11f9509853b2c86f8d2045f900cf1f5..1bb929e675dfd525159600fb7bc21658c2237568 100644 (file)
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -2947,13 +2947,13 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtkx.h")]
        public class Plug : Gtk.Window, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
-               public Plug (Gtk.Window socket_id);
-               public void @construct (Gtk.Window socket_id);
-               public void construct_for_display (Gdk.Display display, Gtk.Window socket_id);
+               public Plug (X.Window socket_id);
+               public void @construct (X.Window socket_id);
+               public void construct_for_display (Gdk.Display display, X.Window socket_id);
                [CCode (has_construct_function = false, type = "GtkWidget*")]
-               public Plug.for_display (Gdk.Display display, Gtk.Window socket_id);
+               public Plug.for_display (Gdk.Display display, X.Window socket_id);
                public bool get_embedded ();
-               public unowned Gtk.Window get_id ();
+               public X.Window get_id ();
                public unowned Gdk.Window get_socket_window ();
                public bool embedded { get; }
                public Gdk.Window socket_window { get; }
@@ -3749,8 +3749,8 @@ namespace Gtk {
        public class Socket : Gtk.Container, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Socket ();
-               public void add_id (Gtk.Window window);
-               public unowned Gtk.Window get_id ();
+               public void add_id (X.Window window);
+               public X.Window get_id ();
                public unowned Gdk.Window get_plug_window ();
                public virtual signal void plug_added ();
                public virtual signal bool plug_removed ();