gtk+-2.0, gtk+-3.0: Fix more clipboard-related bindings

Fixes bug 645071.

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index 4bd0541e34c53ba93dbe2a67c79b883b03736a4c..7d27503aaff50f46da3f7227019709c9efa4e278 100644 (file)
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -1157,12 +1157,14 @@ namespace Gtk {
                public bool set_with_data (Gtk.TargetEntry[] targets, Gtk.ClipboardGetFunc get_func, Gtk.ClipboardClearFunc clear_func);
                public bool set_with_owner (Gtk.TargetEntry[] targets, Gtk.ClipboardGetFunc get_func, Gtk.ClipboardClearFunc clear_func, GLib.Object owner);
                public void store ();
-               public unowned Gtk.SelectionData wait_for_contents (Gdk.Atom target);
-               public unowned Gdk.Pixbuf wait_for_image ();
-               public uchar wait_for_rich_text (Gtk.TextBuffer buffer, out Gdk.Atom format, size_t length);
-               public bool wait_for_targets (Gdk.Atom[] targets);
-               public unowned string wait_for_text ();
-               public unowned string wait_for_uris ();
+               public Gtk.SelectionData? wait_for_contents (Gdk.Atom target);
+               public Gdk.Pixbuf? wait_for_image ();
+               [CCode (array_length_type = "gsize")]
+               public uint8[]? wait_for_rich_text (Gtk.TextBuffer buffer, out Gdk.Atom format);
+               public bool wait_for_targets (out Gdk.Atom[] targets);
+               public string? wait_for_text ();
+               [CCode (array_length = false, array_null_terminated = true)]
+               public string[]? wait_for_uris ();
                public bool wait_is_image_available ();
                public bool wait_is_rich_text_available (Gtk.TextBuffer buffer);
                public bool wait_is_target_available (Gdk.Atom target);

diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 8dd6ce5fc18ceb50c97248c6b311d8145469d33e..f93b16104690f35907d502292ba63d1421104a31 100644 (file)
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -1280,12 +1280,14 @@ namespace Gtk {
                public bool set_with_data (Gtk.TargetEntry[] targets, Gtk.ClipboardGetFunc get_func, Gtk.ClipboardClearFunc clear_func);
                public bool set_with_owner (Gtk.TargetEntry[] targets, Gtk.ClipboardGetFunc get_func, Gtk.ClipboardClearFunc clear_func, GLib.Object owner);
                public void store ();
-               public unowned Gtk.SelectionData wait_for_contents (Gdk.Atom target);
-               public unowned Gdk.Pixbuf wait_for_image ();
-               public uchar wait_for_rich_text (Gtk.TextBuffer buffer, out Gdk.Atom format, size_t length);
-               public bool wait_for_targets (Gdk.Atom[] targets);
-               public unowned string wait_for_text ();
-               public unowned string wait_for_uris ();
+               public Gtk.SelectionData? wait_for_contents (Gdk.Atom target);
+               public Gdk.Pixbuf? wait_for_image ();
+               [CCode (array_length_type = "gsize")]
+               public uint8[]? wait_for_rich_text (Gtk.TextBuffer buffer, out Gdk.Atom format);
+               public bool wait_for_targets (out Gdk.Atom[] targets);
+               public string? wait_for_text ();
+               [CCode (array_length = false, array_null_terminated = true)]
+               public string[]? wait_for_uris ();
                public bool wait_is_image_available ();
                public bool wait_is_rich_text_available (Gtk.TextBuffer buffer);
                public bool wait_is_target_available (Gdk.Atom target);

diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index 62ecb86d32a4380236d4b9cdc9f22304914b9e1b..e2df5f471dbff85db10755b5997be180c0476153 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -125,6 +125,14 @@ GtkCList::select_row has_emitter="1"
 GtkCList::undo_selection has_emitter="1"
 GtkCList::unselect_all has_emitter="1"
 GtkCList::unselect_row has_emitter="1"
+gtk_clipboard_wait_for_contents transfer_ownership="1" nullable="1"
+gtk_clipboard_wait_for_text transfer_ownership="1" nullable="1"
+gtk_clipboard_wait_for_image transfer_ownership="1" nullable="1"
+gtk_clipboard_wait_for_rich_text type_name="uint8" is_array="1" transfer_ownership="1" array_length_type="gsize" nullable="1"
+gtk_clipboard_wait_for_rich_text.length hidden="1"
+gtk_clipboard_wait_for_uris is_array="1" no_array_length="1" array_null_terminated="1" transfer_ownership="1" nullable="1"
+gtk_clipboard_wait_for_targets.targets is_out="1" is_array="1" transfer_ownership="1"
+gtk_clipboard_wait_for_targets.n_targets hidden="1"
 GtkClipboardTextReceivedFunc.text nullable="1"
 GtkClipboardTargetsReceivedFunc.atoms is_array="1"
 GtkClipboardTargetsReceivedFunc.n_atoms hidden="1"

diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
index c13e1f1726f459d6413d83cf0a382eefb68838fa..d23f61a2d648975a9ababc2c0f2e9b8deb038147 100644 (file)
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -139,6 +139,14 @@ GtkCList::select_row has_emitter="1"
 GtkCList::undo_selection has_emitter="1"
 GtkCList::unselect_all has_emitter="1"
 GtkCList::unselect_row has_emitter="1"
+gtk_clipboard_wait_for_contents transfer_ownership="1" nullable="1"
+gtk_clipboard_wait_for_text transfer_ownership="1" nullable="1"
+gtk_clipboard_wait_for_image transfer_ownership="1" nullable="1"
+gtk_clipboard_wait_for_rich_text type_name="uint8" is_array="1" transfer_ownership="1" array_length_type="gsize" nullable="1"
+gtk_clipboard_wait_for_rich_text.length hidden="1"
+gtk_clipboard_wait_for_uris is_array="1" no_array_length="1" array_null_terminated="1" transfer_ownership="1" nullable="1"
+gtk_clipboard_wait_for_targets.targets is_out="1" is_array="1" transfer_ownership="1"
+gtk_clipboard_wait_for_targets.n_targets hidden="1"
 GtkClipboardTextReceivedFunc.text nullable="1"
 GtkClipboardTargetsReceivedFunc.atoms is_array="1"
 GtkClipboardTargetsReceivedFunc.n_atoms hidden="1"