gdk-x11-2.0, gdk-x11-3.0: fix X11Display.broadcast_startup_message

Fixes bug 677986.

diff --git a/vapi/gdk-x11-2.0.vapi b/vapi/gdk-x11-2.0.vapi
index 53e94b2edebd8af392cffc1b3dd4f9543c2a9f6d..12badd678fbefb04e26f98263e1ae8bfa545b4c4 100644 (file)
--- a/vapi/gdk-x11-2.0.vapi
+++ b/vapi/gdk-x11-2.0.vapi
@@ -12,11 +12,11 @@ namespace Gdk {
        [CCode (cheader_filename = "gdk/gdkx.h")]
        public static unowned X.Display x11_colormap_get_xdisplay (Gdk.Colormap colormap);
        [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static unowned Gdk.Cursor x11_cursor_get_xcursor (Gdk.Cursor cursor);
+       public static X.Cursor x11_cursor_get_xcursor (Gdk.Cursor cursor);
        [CCode (cheader_filename = "gdk/gdkx.h")]
        public static unowned X.Display x11_cursor_get_xdisplay (Gdk.Cursor cursor);
        [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static void x11_display_broadcast_startup_message (Gdk.Display display, string message_type);
+       public static void x11_display_broadcast_startup_message (Gdk.Display display, string message_type, ...);
        [CCode (cheader_filename = "gdk/gdkx.h")]
        public static unowned string x11_display_get_startup_notification_id (Gdk.Display display);
        [CCode (cheader_filename = "gdk/gdkx.h")]
@@ -76,13 +76,13 @@ namespace Gdk {
        [CCode (cheader_filename = "gdk/gdkx.h")]
        public static unowned X.Screen x11_screen_get_xscreen (Gdk.Screen screen);
        [CCode (cheader_filename = "gdk/gdkx.h")]
-       public static unowned Gdk.Visual x11_screen_lookup_visual (Gdk.Screen screen, uint32 xvisualid);
+       public static unowned Gdk.Visual x11_screen_lookup_visual (Gdk.Screen screen, X.VisualID xvisualid);
        [CCode (cheader_filename = "gdk/gdkx.h")]
        public static bool x11_screen_supports_net_wm_hint (Gdk.Screen screen, Gdk.Atom property);
        [CCode (cheader_filename = "gdk/gdkx.h")]
        public static void x11_ungrab_server ();
        [CCode (cheader_filename = "gdk/gdkx.h", cname = "gdkx_visual_get")]
-       public static unowned Gdk.Visual x11_visual_get (uint32 xvisualid);
+       public static unowned Gdk.Visual x11_visual_get (X.VisualID xvisualid);
        [CCode (cheader_filename = "gdk/gdkx.h")]
        public static unowned X.Visual x11_visual_get_xvisual (Gdk.Visual visual);
        [CCode (cheader_filename = "gdk/gdkx.h")]

diff --git a/vapi/gdk-x11-3.0.vapi b/vapi/gdk-x11-3.0.vapi
index 3c5b0b1761d25f178a2347a5bf6b2ef48eceb46d..443dceeca7ea7bfc7ef30c4d5af8309be056e784 100644 (file)
--- a/vapi/gdk-x11-3.0.vapi
+++ b/vapi/gdk-x11-3.0.vapi
@@ -14,7 +14,7 @@ namespace Gdk {
        public class X11Cursor : Gdk.Cursor {
                [CCode (has_construct_function = false)]
                protected X11Cursor ();
-               public static unowned Gdk.Cursor get_xcursor (Gdk.Cursor cursor);
+               public static X.Cursor get_xcursor (Gdk.Cursor cursor);
                public static unowned X.Display get_xdisplay (Gdk.Cursor cursor);
        }
        [CCode (cheader_filename = "gdk/gdkx.h")]
@@ -25,7 +25,7 @@ namespace Gdk {
        public class X11Display : Gdk.Display {
                [CCode (has_construct_function = false)]
                protected X11Display ();
-               public static void broadcast_startup_message (Gdk.Display display, string message_type);
+               public static void broadcast_startup_message (Gdk.Display display, string message_type, ...);
                public static int error_trap_pop (Gdk.Display display);
                public static void error_trap_pop_ignored (Gdk.Display display);
                public static void error_trap_push (Gdk.Display display);
@@ -79,7 +79,7 @@ namespace Gdk {
                public static int get_screen_number (Gdk.Screen screen);
                public static unowned string get_window_manager_name (Gdk.Screen screen);
                public static unowned X.Screen get_xscreen (Gdk.Screen screen);
-               public static unowned Gdk.Visual lookup_visual (Gdk.Screen screen, uint32 xvisualid);
+               public static unowned Gdk.Visual lookup_visual (Gdk.Screen screen, X.VisualID xvisualid);
                public static bool supports_net_wm_hint (Gdk.Screen screen, Gdk.Atom property);
                public virtual signal void window_manager_changed ();
        }

diff --git a/vapi/packages/gdk-x11-2.0/gdk-x11-2.0.metadata b/vapi/packages/gdk-x11-2.0/gdk-x11-2.0.metadata
index a8c19a9e16e59833f5ec71eeac4606533889e6e9..9578a6b418fc77514240ba26d3319690a564ec58 100644 (file)
--- a/vapi/packages/gdk-x11-2.0/gdk-x11-2.0.metadata
+++ b/vapi/packages/gdk-x11-2.0/gdk-x11-2.0.metadata
@@ -4,6 +4,7 @@ XID name="uint32"
 XImage name="pointer"
 GC name="pointer"
 Display name="pointer"
+gdk_x11_display_broadcast_startup_message ellipsis="1"
 gdkx_visual_get name="x11_visual_get"
 gdk_net_wm_supports name="x11_net_wm_supports"
 gdk_xid_table_lookup name="x11_xid_table_lookup"

diff --git a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.metadata b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.metadata
index 2561a026b9012ef0c11936bb120b1f7288d7db26..6597f5f2ffc3be0225f31812bc4c8f2aed26682c 100644 (file)
--- a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.metadata
+++ b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.metadata
@@ -4,4 +4,5 @@ XID name="uint32"
 XImage name="pointer"
 GC name="pointer"
 Display name="pointer"
+gdk_x11_display_broadcast_startup_message ellipsis="1"
 GdkEventTranslator hidden="1"