From: Michal Hruby Date: Thu, 17 Mar 2011 20:53:52 +0000 (+0100) Subject: gtk+-2.0, gtk+-3.0: Fix more clipboard-related bindings X-Git-Tag: 0.12.0~36 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18de0553dbeb1519cc04f652d71b2df7270b4727;p=thirdparty%2Fvala.git 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 4bd0541e3..7d27503aa 100644 --- 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 8dd6ce5fc..f93b16104 100644 --- 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 62ecb86d3..e2df5f471 100644 --- 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 c13e1f172..d23f61a2d 100644 --- 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"