vala r1040 - in trunk: . vapi
- From: juergbi svn gnome org
- To: svn-commits-list gnome org
- Subject: vala r1040 - in trunk: . vapi
- Date: Sat, 23 Feb 2008 17:49:14 +0000 (GMT)
Author: juergbi
Date: Sat Feb 23 17:49:14 2008
New Revision: 1040
URL: http://svn.gnome.org/viewvc/vala?rev=1040&view=rev
Log:
2008-02-23 Juerg Billeter <j bitron ch>
* vapi/gconf-2.0.vapi, vapi/gdk-2.0.vapi, vapi/gdk-pixbuf-2.0.vapi,
vapi/gio-2.0.vapi, vapi/gnet-2.0.vapi, vapi/gnome-vfs-2.0.vapi,
vapi/gstreamer-0.10.vapi, vapi/gstreamer-audio-0.10.vapi,
vapi/gstreamer-base-0.10.vapi, vapi/gstreamer-pbutils-0.10.vapi,
vapi/gtk+-2.0.vapi, vapi/libglade-2.0.vapi, vapi/libgnome-menu.vapi,
vapi/libgnomeui-2.0.vapi, vapi/libnotify.vap, vapi/libsoup-2.2.vapi,
vapi/libsoup-2.4.vapi, vapi/poppler-glib.vapi: regenerated
Modified:
trunk/ChangeLog
trunk/vapi/gconf-2.0.vapi
trunk/vapi/gdk-2.0.vapi
trunk/vapi/gdk-pixbuf-2.0.vapi
trunk/vapi/gio-2.0.vapi
trunk/vapi/gnet-2.0.vapi
trunk/vapi/gnome-vfs-2.0.vapi
trunk/vapi/gstreamer-0.10.vapi
trunk/vapi/gstreamer-audio-0.10.vapi
trunk/vapi/gstreamer-base-0.10.vapi
trunk/vapi/gstreamer-pbutils-0.10.vapi
trunk/vapi/gtk+-2.0.vapi
trunk/vapi/libglade-2.0.vapi
trunk/vapi/libgnome-menu.vapi
trunk/vapi/libgnomeui-2.0.vapi
trunk/vapi/libnotify.vapi
trunk/vapi/libsoup-2.2.vapi
trunk/vapi/libsoup-2.4.vapi
trunk/vapi/poppler-glib.vapi
Modified: trunk/vapi/gconf-2.0.vapi
==============================================================================
--- trunk/vapi/gconf-2.0.vapi (original)
+++ trunk/vapi/gconf-2.0.vapi Sat Feb 23 17:49:14 2008
@@ -76,7 +76,7 @@
public weak GConf.Value get_with_locale (string key, string locale) throws GLib.Error;
public weak GConf.Value get_without_default (string key) throws GLib.Error;
public bool key_is_writable (string key) throws GLib.Error;
- public uint notify_add (string namespace_section, GConf.NotifyFunc func, pointer user_data) throws GLib.Error;
+ public uint notify_add (string namespace_section, GConf.NotifyFunc func) throws GLib.Error;
public void notify_remove (uint cnxn);
public void remove_dir (string dir) throws GLib.Error;
public weak GConf.ChangeSet reverse_change_set (GConf.ChangeSet cs) throws GLib.Error;
@@ -121,12 +121,12 @@
public class Listeners {
public uint add (string listen_point, pointer listener_data, GLib.FreeFunc destroy_notify);
public uint count ();
- public void @foreach (GConf.ListenersForeach callback, pointer user_data);
+ public void @foreach (GConf.ListenersForeach callback);
public bool get_data (uint cnxn_id, pointer listener_data_p, string location_p);
public Listeners ();
- public void notify (string all_above, GConf.ListenersCallback callback, pointer user_data);
+ public void notify (string all_above, GConf.ListenersCallback callback);
public void remove (uint cnxn_id);
- public void remove_if (GConf.ListenersPredicate predicate, pointer user_data);
+ public void remove_if (GConf.ListenersPredicate predicate);
}
[CCode (cheader_filename = "gconf/gconf.h")]
public class MetaInfo {
@@ -200,7 +200,7 @@
public class ChangeSet : GLib.Boxed {
public bool check_value (string key, out weak GConf.Value value_retloc);
public void clear ();
- public void @foreach (GConf.ChangeSetForeachFunc func, pointer user_data);
+ public void @foreach (GConf.ChangeSetForeachFunc func);
public pointer get_user_data ();
public ChangeSet ();
public void remove (string key);
@@ -252,7 +252,7 @@
public weak GConf.Value get_without_default (string key) throws GLib.Error;
public bool key_is_writable (string key) throws GLib.Error;
public void notify (string key);
- public uint notify_add (string namespace_section, GConf.ClientNotifyFunc func, pointer user_data, GLib.FreeFunc destroy_notify) throws GLib.Error;
+ public uint notify_add (string namespace_section, GConf.ClientNotifyFunc func, GLib.FreeFunc destroy_notify) throws GLib.Error;
public void notify_remove (uint cnxn);
public void preload (string dirname, GConf.ClientPreloadType type) throws GLib.Error;
public bool recursive_unset (string key, GConf.UnsetFlags flags) throws GLib.Error;
@@ -277,13 +277,13 @@
[HasEmitter]
public signal void value_changed (string key, pointer value);
}
- public static delegate void ChangeSetForeachFunc (GConf.ChangeSet cs, string key, GConf.Value value, pointer user_data);
+ public delegate void ChangeSetForeachFunc (GConf.ChangeSet cs, string key, GConf.Value value);
public static delegate void ClientErrorHandlerFunc (GConf.Client client, GLib.Error error);
- public static delegate void ClientNotifyFunc (GConf.Client client, uint cnxn_id, GConf.Entry entry, pointer user_data);
- public static delegate void ListenersCallback (GConf.Listeners listeners, string all_above_key, uint cnxn_id, pointer listener_data, pointer user_data);
- public static delegate void ListenersForeach (string location, uint cnxn_id, pointer listener_data, pointer user_data);
- public static delegate bool ListenersPredicate (string location, uint cnxn_id, pointer listener_data, pointer user_data);
- public static delegate void NotifyFunc (GConf.Engine conf, uint cnxn_id, GConf.Entry entry, pointer user_data);
+ public delegate void ClientNotifyFunc (GConf.Client client, uint cnxn_id, GConf.Entry entry);
+ public delegate void ListenersCallback (GConf.Listeners listeners, string all_above_key, uint cnxn_id, pointer listener_data);
+ public delegate void ListenersForeach (string location, uint cnxn_id, pointer listener_data);
+ public delegate bool ListenersPredicate (string location, uint cnxn_id, pointer listener_data);
+ public delegate void NotifyFunc (GConf.Engine conf, uint cnxn_id, GConf.Entry entry);
[CCode (cheader_filename = "gconf/gconf.h")]
public static weak string concat_dir_and_key (string dir, string key);
[CCode (cheader_filename = "gconf/gconf.h")]
Modified: trunk/vapi/gdk-2.0.vapi
==============================================================================
--- trunk/vapi/gdk-2.0.vapi (original)
+++ trunk/vapi/gdk-2.0.vapi Sat Feb 23 17:49:14 2008
@@ -1331,7 +1331,7 @@
public void iconify ();
public void input_shape_combine_mask (Gdk.Bitmap mask, int x, int y);
public void input_shape_combine_region (Gdk.Region shape_region, int offset_x, int offset_y);
- public void invalidate_maybe_recurse (Gdk.Region region, GLib.Callback child_func, pointer user_data);
+ public void invalidate_maybe_recurse (Gdk.Region region, GLib.Callback child_func);
public void invalidate_rect (Gdk.Rectangle rect, bool invalidate_children);
public void invalidate_region (Gdk.Region region, bool invalidate_children);
public bool is_viewable ();
@@ -1694,9 +1694,9 @@
[CCode (cheader_filename = "gdk/gdk.h")]
public static bool spawn_command_line_on_screen (Gdk.Screen screen, string command_line) throws GLib.Error;
[CCode (cheader_filename = "gdk/gdk.h")]
- public static bool spawn_on_screen (Gdk.Screen screen, string working_directory, string argv, string envp, GLib.SpawnFlags flags, GLib.SpawnChildSetupFunc child_setup, pointer user_data, int child_pid) throws GLib.Error;
+ public static bool spawn_on_screen (Gdk.Screen screen, string working_directory, string argv, string envp, GLib.SpawnFlags flags, GLib.SpawnChildSetupFunc child_setup, int child_pid) throws GLib.Error;
[CCode (cheader_filename = "gdk/gdk.h")]
- public static bool spawn_on_screen_with_pipes (Gdk.Screen screen, string working_directory, string argv, string envp, GLib.SpawnFlags flags, GLib.SpawnChildSetupFunc child_setup, pointer user_data, int child_pid, int standard_input, int standard_output, int standard_error) throws GLib.Error;
+ public static bool spawn_on_screen_with_pipes (Gdk.Screen screen, string working_directory, string argv, string envp, GLib.SpawnFlags flags, GLib.SpawnChildSetupFunc child_setup, int child_pid, int standard_input, int standard_output, int standard_error) throws GLib.Error;
[CCode (cheader_filename = "gdk/gdk.h")]
public static int string_to_compound_text (string str, Gdk.Atom encoding, int format, uchar[] ctext, int length);
[CCode (cheader_filename = "gdk/gdk.h")]
Modified: trunk/vapi/gdk-pixbuf-2.0.vapi
==============================================================================
--- trunk/vapi/gdk-pixbuf-2.0.vapi (original)
+++ trunk/vapi/gdk-pixbuf-2.0.vapi Sat Feb 23 17:49:14 2008
@@ -108,8 +108,8 @@
public bool save (string filename, string type) throws GLib.Error;
public bool save_to_buffer (string buffer, ulong buffer_size, string type) throws GLib.Error;
public bool save_to_bufferv (string buffer, ulong buffer_size, string type, string[] option_keys, string[] option_values) throws GLib.Error;
- public bool save_to_callback (Gdk.PixbufSaveFunc save_func, pointer user_data, string type) throws GLib.Error;
- public bool save_to_callbackv (Gdk.PixbufSaveFunc save_func, pointer user_data, string type, string[] option_keys, string[] option_values) throws GLib.Error;
+ public bool save_to_callback (Gdk.PixbufSaveFunc save_func, string type) throws GLib.Error;
+ public bool save_to_callbackv (Gdk.PixbufSaveFunc save_func, string type, string[] option_keys, string[] option_values) throws GLib.Error;
public bool savev (string filename, string type, out weak string option_keys, out weak string option_values) throws GLib.Error;
public void scale (Gdk.Pixbuf dest, int dest_x, int dest_y, int dest_width, int dest_height, double offset_x, double offset_y, double scale_x, double scale_y, Gdk.InterpType interp_type);
public weak Gdk.Pixbuf scale_simple (int dest_width, int dest_height, Gdk.InterpType interp_type);
Modified: trunk/vapi/gio-2.0.vapi
==============================================================================
--- trunk/vapi/gio-2.0.vapi (original)
+++ trunk/vapi/gio-2.0.vapi Sat Feb 23 17:49:14 2008
@@ -217,8 +217,8 @@
}
[CCode (cheader_filename = "gio/gio.h")]
public class IOSchedulerJob {
- public bool send_to_mainloop (GLib.SourceFunc func, pointer user_data, GLib.DestroyNotify notify);
- public void send_to_mainloop_async (GLib.SourceFunc func, pointer user_data, GLib.DestroyNotify notify);
+ public bool send_to_mainloop (GLib.SourceFunc func, GLib.DestroyNotify notify);
+ public void send_to_mainloop_async (GLib.SourceFunc func, GLib.DestroyNotify notify);
}
[CCode (cheader_filename = "gio/gio.h")]
public class SimpleAsyncResultClass {
@@ -244,7 +244,7 @@
public int read_byte (GLib.Cancellable cancellable) throws GLib.Error;
public void set_buffer_size (ulong size);
public virtual long fill (long count, GLib.Cancellable cancellable) throws GLib.Error;
- public virtual void fill_async (long count, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public virtual void fill_async (long count, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public virtual long fill_finish (GLib.AsyncResult _result) throws GLib.Error;
public weak uint buffer_size { get; set construct; }
}
@@ -312,12 +312,12 @@
public bool has_pending ();
public bool is_closed ();
public void set_pending (bool pending);
- public virtual void close_async (int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public virtual void close_async (int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public virtual bool close_finish (GLib.AsyncResult _result) throws GLib.Error;
[NoWrapper]
public virtual bool close_fn (GLib.Cancellable cancellable) throws GLib.Error;
public virtual weak GLib.FileInfo next_file (GLib.Cancellable cancellable) throws GLib.Error;
- public virtual void next_files_async (int num_files, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public virtual void next_files_async (int num_files, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public virtual weak GLib.List next_files_finish (GLib.AsyncResult _result) throws GLib.Error;
}
[CCode (cheader_filename = "gio/gio.h")]
@@ -389,7 +389,7 @@
[NoWrapper]
public virtual bool can_seek ();
public virtual weak GLib.FileInfo query_info (string attributes, GLib.Cancellable cancellable) throws GLib.Error;
- public virtual void query_info_async (string attributes, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public virtual void query_info_async (string attributes, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public virtual weak GLib.FileInfo query_info_finish (GLib.AsyncResult _result) throws GLib.Error;
[NoWrapper]
public virtual bool seek (int64 offset, GLib.SeekType type, GLib.Cancellable cancellable) throws GLib.Error;
@@ -418,7 +418,7 @@
public virtual bool can_truncate ();
public virtual weak string get_etag ();
public virtual weak GLib.FileInfo query_info (string attributes, GLib.Cancellable cancellable) throws GLib.Error;
- public virtual void query_info_async (string attributes, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public virtual void query_info_async (string attributes, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public virtual weak GLib.FileInfo query_info_finish (GLib.AsyncResult _result) throws GLib.Error;
[NoWrapper]
public virtual bool seek (int64 offset, GLib.SeekType type, GLib.Cancellable cancellable) throws GLib.Error;
@@ -462,16 +462,16 @@
public long read (pointer buffer, ulong count, GLib.Cancellable cancellable) throws GLib.Error;
public bool read_all (pointer buffer, ulong count, out ulong bytes_read, GLib.Cancellable cancellable) throws GLib.Error;
public bool set_pending () throws GLib.Error;
- public virtual void close_async (int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public virtual void close_async (int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public virtual bool close_finish (GLib.AsyncResult _result) throws GLib.Error;
[NoWrapper]
public virtual bool close_fn (GLib.Cancellable cancellable) throws GLib.Error;
- public virtual void read_async (pointer buffer, ulong count, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public virtual void read_async (pointer buffer, ulong count, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public virtual long read_finish (GLib.AsyncResult _result) throws GLib.Error;
[NoWrapper]
public virtual long read_fn (pointer buffer, ulong count, GLib.Cancellable cancellable) throws GLib.Error;
public virtual long skip (ulong count, GLib.Cancellable cancellable) throws GLib.Error;
- public virtual void skip_async (ulong count, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public virtual void skip_async (ulong count, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public virtual long skip_finish (GLib.AsyncResult _result) throws GLib.Error;
}
[CCode (cheader_filename = "gio/gio.h")]
@@ -526,17 +526,17 @@
public bool set_pending () throws GLib.Error;
public long write (pointer buffer, ulong count, GLib.Cancellable cancellable) throws GLib.Error;
public bool write_all (pointer buffer, ulong count, ulong bytes_written, GLib.Cancellable cancellable) throws GLib.Error;
- public virtual void close_async (int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public virtual void close_async (int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public virtual bool close_finish (GLib.AsyncResult _result) throws GLib.Error;
[NoWrapper]
public virtual bool close_fn (GLib.Cancellable cancellable) throws GLib.Error;
public virtual bool flush (GLib.Cancellable cancellable) throws GLib.Error;
- public virtual void flush_async (int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public virtual void flush_async (int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public virtual bool flush_finish (GLib.AsyncResult _result) throws GLib.Error;
public virtual long splice (GLib.InputStream source, GLib.OutputStreamSpliceFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
- public virtual void splice_async (GLib.InputStream source, GLib.OutputStreamSpliceFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public virtual void splice_async (GLib.InputStream source, GLib.OutputStreamSpliceFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public virtual long splice_finish (GLib.AsyncResult _result) throws GLib.Error;
- public virtual void write_async (pointer buffer, ulong count, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public virtual void write_async (pointer buffer, ulong count, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public virtual long write_finish (GLib.AsyncResult _result) throws GLib.Error;
[NoWrapper]
public virtual long write_fn (pointer buffer, ulong count, GLib.Cancellable cancellable) throws GLib.Error;
@@ -549,9 +549,9 @@
public pointer get_op_res_gpointer ();
public long get_op_res_gssize ();
public pointer get_source_tag ();
- public SimpleAsyncResult (GLib.Object source_object, GLib.AsyncReadyCallback callback, pointer user_data, pointer source_tag);
- public SimpleAsyncResult.error (GLib.Object source_object, GLib.AsyncReadyCallback callback, pointer user_data, GLib.Quark domain, int code, string format);
- public SimpleAsyncResult.from_error (GLib.Object source_object, GLib.AsyncReadyCallback callback, pointer user_data, GLib.Error error);
+ public SimpleAsyncResult (GLib.Object source_object, GLib.AsyncReadyCallback callback, pointer source_tag);
+ public SimpleAsyncResult.error (GLib.Object source_object, GLib.AsyncReadyCallback callback, GLib.Quark domain, int code, string format);
+ public SimpleAsyncResult.from_error (GLib.Object source_object, GLib.AsyncReadyCallback callback, GLib.Error error);
public bool propagate_error () throws GLib.Error;
public void run_in_thread (GLib.SimpleAsyncThreadFunc func, int io_priority, GLib.Cancellable cancellable);
public void set_error (GLib.Quark domain, int code, string format);
@@ -636,7 +636,7 @@
public interface Drive : GLib.Object {
public abstract bool can_eject ();
public abstract bool can_poll_for_media ();
- public abstract void eject (GLib.MountUnmountFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public abstract void eject (GLib.MountUnmountFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public abstract bool eject_finish (GLib.AsyncResult _result) throws GLib.Error;
public abstract weak string enumerate_identifiers ();
public abstract weak GLib.Icon get_icon ();
@@ -647,7 +647,7 @@
public abstract bool has_volumes ();
public abstract bool is_media_check_automatic ();
public abstract bool is_media_removable ();
- public abstract void poll_for_media (GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public abstract void poll_for_media (GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public abstract bool poll_for_media_finish (GLib.AsyncResult _result) throws GLib.Error;
public signal void changed ();
public signal void disconnected ();
@@ -659,9 +659,9 @@
public bool @delete (GLib.Cancellable cancellable) throws GLib.Error;
public weak GLib.File get_child (string name);
public bool load_contents (GLib.Cancellable cancellable, out weak string contents, ulong length, out weak string etag_out) throws GLib.Error;
- public void load_contents_async (GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public void load_contents_async (GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public bool load_contents_finish (GLib.AsyncResult res, out weak string contents, ulong length, out weak string etag_out) throws GLib.Error;
- public void load_partial_contents_async (GLib.Cancellable cancellable, GLib.FileReadMoreCallback read_more_callback, GLib.AsyncReadyCallback callback, pointer user_data);
+ public void load_partial_contents_async (GLib.Cancellable cancellable, GLib.FileReadMoreCallback read_more_callback, GLib.AsyncReadyCallback callback);
public bool load_partial_contents_finish (GLib.AsyncResult res, out weak string contents, ulong length, out weak string etag_out) throws GLib.Error;
public static GLib.File new_for_commandline_arg (string arg);
public static GLib.File new_for_path (string path);
@@ -671,7 +671,7 @@
public bool query_exists (GLib.Cancellable cancellable);
public weak GLib.FileInputStream read (GLib.Cancellable cancellable) throws GLib.Error;
public bool replace_contents (string contents, ulong length, string etag, bool make_backup, GLib.FileCreateFlags flags, out weak string new_etag, GLib.Cancellable cancellable) throws GLib.Error;
- public void replace_contents_async (string contents, ulong length, string etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public void replace_contents_async (string contents, ulong length, string etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public bool replace_contents_finish (GLib.AsyncResult res, out weak string new_etag) throws GLib.Error;
public bool set_attribute_byte_string (string attribute, string value, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
public bool set_attribute_int32 (string attribute, int value, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
@@ -680,26 +680,26 @@
public bool set_attribute_uint32 (string attribute, uint value, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
public bool set_attribute_uint64 (string attribute, uint64 value, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
public abstract weak GLib.FileOutputStream append_to (GLib.FileCreateFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
- public abstract void append_to_async (GLib.FileCreateFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public abstract void append_to_async (GLib.FileCreateFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public abstract weak GLib.FileOutputStream append_to_finish (GLib.AsyncResult res) throws GLib.Error;
public abstract bool contains_file (GLib.File descendant);
public abstract bool copy (GLib.File destination, GLib.FileCopyFlags flags, GLib.Cancellable cancellable, GLib.FileProgressCallback progress_callback, pointer progress_callback_data) throws GLib.Error;
- public abstract void copy_async (GLib.File destination, GLib.FileCopyFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.FileProgressCallback progress_callback, pointer progress_callback_data, GLib.AsyncReadyCallback callback, pointer user_data);
+ public abstract void copy_async (GLib.File destination, GLib.FileCopyFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.FileProgressCallback progress_callback, pointer progress_callback_data, GLib.AsyncReadyCallback callback);
public abstract bool copy_finish (GLib.AsyncResult res) throws GLib.Error;
public abstract weak GLib.FileOutputStream create (GLib.FileCreateFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
- public abstract void create_async (GLib.FileCreateFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public abstract void create_async (GLib.FileCreateFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public abstract weak GLib.FileOutputStream create_finish (GLib.AsyncResult res) throws GLib.Error;
[NoWrapper]
public abstract bool delete_file (GLib.Cancellable cancellable) throws GLib.Error;
public abstract weak GLib.File dup ();
- public abstract void eject_mountable (GLib.MountUnmountFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public abstract void eject_mountable (GLib.MountUnmountFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public abstract bool eject_mountable_finish (GLib.AsyncResult _result) throws GLib.Error;
public abstract weak GLib.FileEnumerator enumerate_children (string attributes, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
- public abstract void enumerate_children_async (string attributes, GLib.FileQueryInfoFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public abstract void enumerate_children_async (string attributes, GLib.FileQueryInfoFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public abstract weak GLib.FileEnumerator enumerate_children_finish (GLib.AsyncResult res) throws GLib.Error;
public abstract bool equal (GLib.File file2);
public abstract weak GLib.Mount find_enclosing_mount (GLib.Cancellable cancellable) throws GLib.Error;
- public abstract void find_enclosing_mount_async (int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public abstract void find_enclosing_mount_async (int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public abstract weak GLib.Mount find_enclosing_mount_finish (GLib.AsyncResult res) throws GLib.Error;
public abstract weak string get_basename ();
public abstract weak GLib.File get_child_for_display_name (string display_name) throws GLib.Error;
@@ -718,34 +718,34 @@
public abstract weak GLib.FileMonitor monitor_dir (GLib.FileMonitorFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
[NoWrapper]
public abstract weak GLib.FileMonitor monitor_file (GLib.FileMonitorFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
- public abstract void mount_enclosing_volume (GLib.MountMountFlags flags, GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public abstract void mount_enclosing_volume (GLib.MountMountFlags flags, GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public abstract bool mount_enclosing_volume_finish (GLib.AsyncResult _result) throws GLib.Error;
- public abstract void mount_mountable (GLib.MountMountFlags flags, GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public abstract void mount_mountable (GLib.MountMountFlags flags, GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public abstract weak GLib.File mount_mountable_finish (GLib.AsyncResult _result) throws GLib.Error;
public abstract bool move (GLib.File destination, GLib.FileCopyFlags flags, GLib.Cancellable cancellable, GLib.FileProgressCallback progress_callback, pointer progress_callback_data) throws GLib.Error;
public abstract weak GLib.FileInfo query_filesystem_info (string attributes, GLib.Cancellable cancellable) throws GLib.Error;
public abstract weak GLib.FileInfo query_info (string attributes, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
- public abstract void query_info_async (string attributes, GLib.FileQueryInfoFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public abstract void query_info_async (string attributes, GLib.FileQueryInfoFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public abstract weak GLib.FileInfo query_info_finish (GLib.AsyncResult res) throws GLib.Error;
public abstract weak GLib.FileAttributeInfoList query_settable_attributes (GLib.Cancellable cancellable) throws GLib.Error;
public abstract weak GLib.FileAttributeInfoList query_writable_namespaces (GLib.Cancellable cancellable) throws GLib.Error;
- public abstract void read_async (int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public abstract void read_async (int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public abstract weak GLib.FileInputStream read_finish (GLib.AsyncResult res) throws GLib.Error;
[NoWrapper]
public abstract weak GLib.FileInputStream read_fn (GLib.Cancellable cancellable) throws GLib.Error;
public abstract weak GLib.FileOutputStream replace (string etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
- public abstract void replace_async (string etag, bool make_backup, GLib.FileCreateFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public abstract void replace_async (string etag, bool make_backup, GLib.FileCreateFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public abstract weak GLib.FileOutputStream replace_finish (GLib.AsyncResult res) throws GLib.Error;
public abstract weak GLib.File resolve_relative_path (string relative_path);
public abstract bool set_attribute (string attribute, GLib.FileAttributeType type, pointer value_p, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
- public abstract void set_attributes_async (GLib.FileInfo info, GLib.FileQueryInfoFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public abstract void set_attributes_async (GLib.FileInfo info, GLib.FileQueryInfoFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public abstract bool set_attributes_finish (GLib.AsyncResult _result, out weak GLib.FileInfo info) throws GLib.Error;
public abstract bool set_attributes_from_info (GLib.FileInfo info, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
public abstract weak GLib.File set_display_name (string display_name, GLib.Cancellable cancellable) throws GLib.Error;
- public abstract void set_display_name_async (string display_name, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public abstract void set_display_name_async (string display_name, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public abstract weak GLib.File set_display_name_finish (GLib.AsyncResult res) throws GLib.Error;
public abstract bool trash (GLib.Cancellable cancellable) throws GLib.Error;
- public abstract void unmount_mountable (GLib.MountUnmountFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public abstract void unmount_mountable (GLib.MountUnmountFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public abstract bool unmount_mountable_finish (GLib.AsyncResult _result) throws GLib.Error;
}
[CCode (cheader_filename = "gio/gio.h")]
@@ -756,14 +756,14 @@
[CCode (cheader_filename = "gio/gio.h")]
public interface LoadableIcon : GLib.Icon, GLib.Object {
public abstract weak GLib.InputStream load (int size, out weak string type, GLib.Cancellable cancellable) throws GLib.Error;
- public abstract void load_async (int size, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public abstract void load_async (int size, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public abstract weak GLib.InputStream load_finish (GLib.AsyncResult res, out weak string type) throws GLib.Error;
}
[CCode (cheader_filename = "gio/gio.h")]
public interface Mount : GLib.Object {
public abstract bool can_eject ();
public abstract bool can_unmount ();
- public abstract void eject (GLib.MountUnmountFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public abstract void eject (GLib.MountUnmountFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public abstract bool eject_finish (GLib.AsyncResult _result) throws GLib.Error;
public abstract weak GLib.Drive get_drive ();
public abstract weak GLib.Icon get_icon ();
@@ -771,9 +771,9 @@
public abstract weak GLib.File get_root ();
public abstract weak string get_uuid ();
public abstract weak GLib.Volume get_volume ();
- public abstract void remount (GLib.MountMountFlags flags, GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public abstract void remount (GLib.MountMountFlags flags, GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public abstract bool remount_finish (GLib.AsyncResult _result) throws GLib.Error;
- public abstract void unmount (GLib.MountUnmountFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public abstract void unmount (GLib.MountUnmountFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public abstract bool unmount_finish (GLib.AsyncResult _result) throws GLib.Error;
public signal void changed ();
public signal void unmounted ();
@@ -790,10 +790,10 @@
}
[CCode (cheader_filename = "gio/gio.h")]
public interface Volume : GLib.Object {
- public void mount (GLib.MountMountFlags flags, GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public void mount (GLib.MountMountFlags flags, GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public abstract bool can_eject ();
public abstract bool can_mount ();
- public abstract void eject (GLib.MountUnmountFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public abstract void eject (GLib.MountUnmountFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public abstract bool eject_finish (GLib.AsyncResult _result) throws GLib.Error;
public abstract weak string enumerate_identifiers ();
public abstract weak GLib.Drive get_drive ();
@@ -804,15 +804,15 @@
public abstract weak string get_uuid ();
public abstract bool mount_finish (GLib.AsyncResult _result) throws GLib.Error;
[NoWrapper]
- public abstract void mount_fn (GLib.MountMountFlags flags, GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+ public abstract void mount_fn (GLib.MountMountFlags flags, GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback);
public abstract bool should_automount ();
public signal void changed ();
public signal void removed ();
}
- public static delegate void AsyncReadyCallback (GLib.Object source_object, GLib.AsyncResult res, pointer user_data);
- public static delegate void FileProgressCallback (int64 current_num_bytes, int64 total_num_bytes, pointer user_data);
+ public delegate void AsyncReadyCallback (GLib.Object source_object, GLib.AsyncResult res);
+ public delegate void FileProgressCallback (int64 current_num_bytes, int64 total_num_bytes);
public static delegate bool FileReadMoreCallback (string file_contents, int64 file_size, pointer callback_data);
- public static delegate bool IOSchedulerJobFunc (GLib.IOSchedulerJob job, GLib.Cancellable cancellable, pointer user_data);
+ public delegate bool IOSchedulerJobFunc (GLib.IOSchedulerJob job, GLib.Cancellable cancellable);
public static delegate pointer ReallocFunc (pointer data, ulong size);
public static delegate void SimpleAsyncThreadFunc (GLib.SimpleAsyncResult res, GLib.Object object, GLib.Cancellable cancellable);
public const string FILE_ATTRIBUTE_ACCESS_CAN_DELETE;
@@ -912,9 +912,9 @@
[CCode (cname = "g_io_scheduler_cancel_all_jobs", cheader_filename = "gio/gio.h")]
public static void g_io_scheduler_cancel_all_jobs ();
[CCode (cname = "g_io_scheduler_push_job", cheader_filename = "gio/gio.h")]
- public static void g_io_scheduler_push_job (GLib.IOSchedulerJobFunc job_func, pointer user_data, GLib.DestroyNotify notify, int io_priority, GLib.Cancellable cancellable);
+ public static void g_io_scheduler_push_job (GLib.IOSchedulerJobFunc job_func, GLib.DestroyNotify notify, int io_priority, GLib.Cancellable cancellable);
[CCode (cname = "g_simple_async_report_error_in_idle", cheader_filename = "gio/gio.h")]
- public static void g_simple_async_report_error_in_idle (GLib.Object object, GLib.AsyncReadyCallback callback, pointer user_data, GLib.Quark domain, int code, string format);
+ public static void g_simple_async_report_error_in_idle (GLib.Object object, GLib.AsyncReadyCallback callback, GLib.Quark domain, int code, string format);
[CCode (cname = "g_simple_async_report_gerror_in_idle", cheader_filename = "gio/gio.h")]
- public static void g_simple_async_report_gerror_in_idle (GLib.Object object, GLib.AsyncReadyCallback callback, pointer user_data, GLib.Error error);
+ public static void g_simple_async_report_gerror_in_idle (GLib.Object object, GLib.AsyncReadyCallback callback, GLib.Error error);
}
Modified: trunk/vapi/gnet-2.0.vapi
==============================================================================
--- trunk/vapi/gnet-2.0.vapi (original)
+++ trunk/vapi/gnet-2.0.vapi Sat Feb 23 17:49:14 2008
@@ -214,12 +214,12 @@
[CCode (cheader_filename = "gnet.h")]
public struct NetTOS {
}
- public static delegate void ConnFunc (GNet.Conn conn, GNet.ConnEvent event, pointer user_data);
- public static delegate void ConnHttpFunc (GNet.ConnHttp conn, GNet.ConnHttpEvent event, pointer user_data);
+ public delegate void ConnFunc (GNet.Conn conn, GNet.ConnEvent event);
+ public delegate void ConnHttpFunc (GNet.ConnHttp conn, GNet.ConnHttpEvent event);
public static delegate void InetAddrGetNameAsyncFunc (string hostname, pointer data);
public static delegate void InetAddrNewAsyncFunc (GNet.InetAddr inetaddr, pointer data);
public static delegate void InetAddrNewListAsyncFunc (GLib.List list, pointer data);
- public static delegate void ServerFunc (GNet.Server server, GNet.Conn conn, pointer user_data);
+ public delegate void ServerFunc (GNet.Server server, GNet.Conn conn);
public static delegate void TcpSocketAcceptFunc (GNet.TcpSocket server, GNet.TcpSocket client, pointer data);
public static delegate void TcpSocketConnectAsyncFunc (GNet.TcpSocket socket, GNet.TcpSocketConnectAsyncStatus status, pointer data);
public static delegate void TcpSocketNewAsyncFunc (GNet.TcpSocket socket, pointer data);
@@ -247,9 +247,9 @@
[CCode (cheader_filename = "gnet.h")]
public static weak GNet.ConnHttp conn_http_new ();
[CCode (cheader_filename = "gnet.h")]
- public static bool conn_http_run (GNet.ConnHttp conn, GNet.ConnHttpFunc func, pointer user_data);
+ public static bool conn_http_run (GNet.ConnHttp conn, GNet.ConnHttpFunc func);
[CCode (cheader_filename = "gnet.h")]
- public static void conn_http_run_async (GNet.ConnHttp conn, GNet.ConnHttpFunc func, pointer user_data);
+ public static void conn_http_run_async (GNet.ConnHttp conn, GNet.ConnHttpFunc func);
[CCode (cheader_filename = "gnet.h")]
public static bool conn_http_set_escaped_uri (GNet.ConnHttp conn, string uri);
[CCode (cheader_filename = "gnet.h")]
@@ -271,11 +271,11 @@
[CCode (cheader_filename = "gnet.h")]
public static bool conn_is_connected (GNet.Conn conn);
[CCode (cheader_filename = "gnet.h")]
- public static weak GNet.Conn conn_new (string hostname, int port, GNet.ConnFunc func, pointer user_data);
+ public static weak GNet.Conn conn_new (string hostname, int port, GNet.ConnFunc func);
[CCode (cname = "gnet_conn_new_inetaddr", cheader_filename = "gnet.h")]
- public static weak GNet.Conn from_inetaddr (GNet.InetAddr inetaddr, GNet.ConnFunc func, pointer user_data);
+ public static weak GNet.Conn from_inetaddr (GNet.InetAddr inetaddr, GNet.ConnFunc func);
[CCode (cname = "gnet_conn_new_socket", cheader_filename = "gnet.h")]
- public static weak GNet.Conn from_socket (GNet.TcpSocket socket, GNet.ConnFunc func, pointer user_data);
+ public static weak GNet.Conn from_socket (GNet.TcpSocket socket, GNet.ConnFunc func);
[CCode (cheader_filename = "gnet.h")]
public static void conn_read (GNet.Conn conn);
[CCode (cheader_filename = "gnet.h")]
@@ -285,7 +285,7 @@
[CCode (cheader_filename = "gnet.h")]
public static void conn_ref (GNet.Conn conn);
[CCode (cheader_filename = "gnet.h")]
- public static void conn_set_callback (GNet.Conn conn, GNet.ConnFunc func, pointer user_data);
+ public static void conn_set_callback (GNet.Conn conn, GNet.ConnFunc func);
[CCode (cheader_filename = "gnet.h")]
public static bool conn_set_main_context (GNet.Conn conn, GLib.MainContext context);
[CCode (cheader_filename = "gnet.h")]
@@ -473,7 +473,7 @@
[CCode (cheader_filename = "gnet.h")]
public static void server_delete (GNet.Server server);
[CCode (cheader_filename = "gnet.h")]
- public static weak GNet.Server server_new (GNet.InetAddr iface, int port, GNet.ServerFunc func, pointer user_data);
+ public static weak GNet.Server server_new (GNet.InetAddr iface, int port, GNet.ServerFunc func);
[CCode (cheader_filename = "gnet.h")]
public static void server_ref (GNet.Server server);
[CCode (cheader_filename = "gnet.h")]
@@ -539,7 +539,7 @@
[CCode (cheader_filename = "gnet.h")]
public static weak GNet.TcpSocket tcp_socket_server_accept (GNet.TcpSocket socket);
[CCode (cheader_filename = "gnet.h")]
- public static void tcp_socket_server_accept_async (GNet.TcpSocket socket, GNet.TcpSocketAcceptFunc accept_func, pointer user_data);
+ public static void tcp_socket_server_accept_async (GNet.TcpSocket socket, GNet.TcpSocketAcceptFunc accept_func);
[CCode (cheader_filename = "gnet.h")]
public static void tcp_socket_server_accept_async_cancel (GNet.TcpSocket socket);
[CCode (cheader_filename = "gnet.h")]
Modified: trunk/vapi/gnome-vfs-2.0.vapi
==============================================================================
--- trunk/vapi/gnome-vfs-2.0.vapi (original)
+++ trunk/vapi/gnome-vfs-2.0.vapi Sat Feb 23 17:49:14 2008
@@ -791,7 +791,7 @@
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public class Drive : GLib.Object {
public int compare (GnomeVFS.Drive b);
- public void eject (GnomeVFS.VolumeOpCallback callback, pointer user_data);
+ public void eject (GnomeVFS.VolumeOpCallback callback);
public weak string get_activation_uri ();
public weak string get_device_path ();
public GnomeVFS.DeviceType get_device_type ();
@@ -804,10 +804,10 @@
public bool is_connected ();
public bool is_mounted ();
public bool is_user_visible ();
- public void mount (GnomeVFS.VolumeOpCallback callback, pointer user_data);
+ public void mount (GnomeVFS.VolumeOpCallback callback);
public bool needs_eject ();
public weak GnomeVFS.Drive @ref ();
- public void unmount (GnomeVFS.VolumeOpCallback callback, pointer user_data);
+ public void unmount (GnomeVFS.VolumeOpCallback callback);
public void unref ();
public static void volume_list_free (GLib.List volumes);
public signal void volume_mounted (GnomeVFS.Volume volume);
@@ -822,7 +822,7 @@
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public class Volume : GLib.Object {
public int compare (GnomeVFS.Volume b);
- public void eject (GnomeVFS.VolumeOpCallback callback, pointer user_data);
+ public void eject (GnomeVFS.VolumeOpCallback callback);
public weak string get_activation_uri ();
public weak string get_device_path ();
public GnomeVFS.DeviceType get_device_type ();
@@ -838,7 +838,7 @@
public bool is_read_only ();
public bool is_user_visible ();
public weak GnomeVFS.Volume @ref ();
- public void unmount (GnomeVFS.VolumeOpCallback callback, pointer user_data);
+ public void unmount (GnomeVFS.VolumeOpCallback callback);
public void unref ();
}
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
@@ -871,15 +871,15 @@
public static delegate void AsyncSeekCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, pointer callback_data);
public static delegate void AsyncSetFileInfoCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, GnomeVFS.FileInfo file_info, pointer callback_data);
public static delegate void AsyncWriteCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, pointer buffer, GnomeVFS.FileSize bytes_requested, GnomeVFS.FileSize bytes_written, pointer callback_data);
- public static delegate int AsyncXferProgressCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.XferProgressInfo info, pointer user_data);
+ public delegate int AsyncXferProgressCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.XferProgressInfo info);
public static delegate void DNSSDBrowseCallback (GnomeVFS.DNSSDBrowseHandle handle, GnomeVFS.DNSSDServiceStatus status, GnomeVFS.DNSSDService service, pointer callback_data);
public static delegate void DNSSDResolveCallback (GnomeVFS.DNSSDResolveHandle handle, GnomeVFS.Result result, GnomeVFS.DNSSDService service, string host, int port, GLib.HashTable text, int text_raw_len, string text_raw, pointer callback_data);
- public static delegate bool DirectoryVisitFunc (string rel_path, GnomeVFS.FileInfo info, bool recursing_will_loop, pointer user_data, bool recurse);
+ public delegate bool DirectoryVisitFunc (string rel_path, GnomeVFS.FileInfo info, bool recursing_will_loop, bool recurse);
public static delegate void ModuleCallback (pointer @in, ulong in_size, pointer @out, ulong out_size, pointer callback_data);
public static delegate void ModuleCallbackResponse (pointer response_data);
- public static delegate void MonitorCallback (GnomeVFS.MonitorHandle handle, string monitor_uri, string info_uri, GnomeVFS.MonitorEventType event_type, pointer user_data);
- public static delegate void VolumeOpCallback (bool succeeded, string error, string detailed_error, pointer user_data);
- public static delegate int XferProgressCallback (GnomeVFS.XferProgressInfo info, pointer user_data);
+ public delegate void MonitorCallback (GnomeVFS.MonitorHandle handle, string monitor_uri, string info_uri, GnomeVFS.MonitorEventType event_type);
+ public delegate void VolumeOpCallback (bool succeeded, string error, string detailed_error);
+ public delegate int XferProgressCallback (GnomeVFS.XferProgressInfo info);
public const string DESKTOP_ENTRY_GROUP;
public const string GNOME_VFS_APPLICATION_REGISTRY_CAN_OPEN_MULTIPLE_FILES;
public const string GNOME_VFS_APPLICATION_REGISTRY_COMMAND;
@@ -972,7 +972,7 @@
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static void async_file_control (GnomeVFS.AsyncHandle handle, string operation, pointer operation_data, GLib.DestroyNotify operation_data_destroy_func, GnomeVFS.AsyncFileControlCallback callback, pointer callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static void async_find_directory (out weak GnomeVFS.AsyncHandle handle_return, GLib.List near_uri_list, GnomeVFS.FindDirectoryKind kind, bool create_if_needed, bool find_if_needed, uint permissions, int priority, GnomeVFS.AsyncFindDirectoryCallback callback, pointer user_data);
+ public static void async_find_directory (out weak GnomeVFS.AsyncHandle handle_return, GLib.List near_uri_list, GnomeVFS.FindDirectoryKind kind, bool create_if_needed, bool find_if_needed, uint permissions, int priority, GnomeVFS.AsyncFindDirectoryCallback callback);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static void async_get_file_info (out weak GnomeVFS.AsyncHandle handle_return, GLib.List uri_list, GnomeVFS.FileInfoOptions options, int priority, GnomeVFS.AsyncGetFileInfoCallback callback, pointer callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
@@ -1248,7 +1248,7 @@
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static void module_callback_set_default (string callback_name, GnomeVFS.ModuleCallback callback, pointer callback_data, GLib.DestroyNotify destroy_notify);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static GnomeVFS.Result monitor_add (out weak GnomeVFS.MonitorHandle handle, string text_uri, GnomeVFS.MonitorType monitor_type, GnomeVFS.MonitorCallback callback, pointer user_data);
+ public static GnomeVFS.Result monitor_add (out weak GnomeVFS.MonitorHandle handle, string text_uri, GnomeVFS.MonitorType monitor_type, GnomeVFS.MonitorCallback callback);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static GnomeVFS.Result monitor_cancel (GnomeVFS.MonitorHandle handle);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
Modified: trunk/vapi/gstreamer-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-0.10.vapi (original)
+++ trunk/vapi/gstreamer-0.10.vapi Sat Feb 23 17:49:14 2008
@@ -560,7 +560,7 @@
public weak Gst.ClockTime get_time ();
public void unschedule ();
public Gst.ClockReturn wait (Gst.ClockTimeDiff jitter);
- public Gst.ClockReturn wait_async (Gst.ClockCallback func, pointer user_data);
+ public Gst.ClockReturn wait_async (Gst.ClockCallback func);
}
[CCode (cheader_filename = "gst/gst.h")]
public class ClockTime {
@@ -664,10 +664,10 @@
public uint master_cookie;
[NoArrayLength]
public weak pointer[] _gst_reserved;
- public weak Gst.Iterator filter (GLib.CompareFunc func, pointer user_data);
- public pointer find_custom (GLib.CompareFunc func, pointer user_data);
- public Gst.IteratorResult fold (Gst.IteratorFoldFunction func, GLib.Value ret, pointer user_data);
- public Gst.IteratorResult @foreach (GLib.Func func, pointer user_data);
+ public weak Gst.Iterator filter (GLib.CompareFunc func);
+ public pointer find_custom (GLib.CompareFunc func);
+ public Gst.IteratorResult fold (Gst.IteratorFoldFunction func, GLib.Value ret);
+ public Gst.IteratorResult @foreach (GLib.Func func);
public Iterator (uint size, GLib.Type type, GLib.Mutex @lock, uint master_cookie, Gst.IteratorNextFunction next, Gst.IteratorItemFunction item, Gst.IteratorResyncFunction resync, Gst.IteratorFreeFunction free);
public Iterator.list (GLib.Type type, GLib.Mutex @lock, uint master_cookie, GLib.List list, pointer owner, Gst.IteratorItemFunction item, Gst.IteratorDisposeFunction free);
public void push (Gst.Iterator other);
@@ -709,14 +709,14 @@
public void parse_clock_lost (out weak Gst.Clock clock);
public void parse_clock_provide (out weak Gst.Clock clock, bool ready);
public void parse_duration (Gst.Format format, int64 duration);
- public void parse_error (out weak GLib.Error gerror, out weak string debug);
- public void parse_info (out weak GLib.Error gerror, out weak string debug);
+ public void parse_error (GLib.Error gerror, out weak string debug);
+ public void parse_info (GLib.Error gerror, out weak string debug);
public void parse_new_clock (out weak Gst.Clock clock);
public void parse_segment_done (Gst.Format format, int64 position);
public void parse_segment_start (Gst.Format format, int64 position);
public void parse_state_changed (out Gst.State oldstate, out Gst.State newstate, out Gst.State pending);
public void parse_tag (out weak Gst.TagList tag_list);
- public void parse_warning (out weak GLib.Error gerror, out weak string debug);
+ public void parse_warning (GLib.Error gerror, out weak string debug);
public static weak string type_get_name (Gst.MessageType type);
public static GLib.Quark type_to_quark (Gst.MessageType type);
}
@@ -847,7 +847,7 @@
public void add_values (Gst.TagMergeMode mode, string tag);
public weak Gst.TagList copy ();
public static bool copy_value (GLib.Value dest, Gst.TagList list, string tag);
- public void @foreach (Gst.TagForeachFunc func, pointer user_data);
+ public void @foreach (Gst.TagForeachFunc func);
public bool get_boolean (string tag, bool value);
public bool get_boolean_index (string tag, uint index, bool value);
public bool get_char (string tag, string value);
@@ -1030,7 +1030,7 @@
public bool fixate_field_nearest_double (string field_name, double target);
public bool fixate_field_nearest_fraction (string field_name, int target_numerator, int target_denominator);
public bool fixate_field_nearest_int (string field_name, int target);
- public bool @foreach (Gst.StructureForeachFunc func, pointer user_data);
+ public bool @foreach (Gst.StructureForeachFunc func);
public static weak Gst.Structure from_string (string string, string end);
public bool get_boolean (string fieldname, out bool value);
public bool get_clock_time (string fieldname, Gst.ClockTime value);
@@ -1054,7 +1054,7 @@
public void id_set (GLib.Quark fieldname, ...);
public void id_set_valist (GLib.Quark fieldname, pointer varargs);
public void id_set_value (GLib.Quark field, GLib.Value value);
- public bool map_in_place (Gst.StructureMapFunc func, pointer user_data);
+ public bool map_in_place (Gst.StructureMapFunc func);
public int n_fields ();
public Structure (string name, string firstfield, ...);
public Structure.valist (string name, string firstfield, pointer varargs);
@@ -1118,8 +1118,8 @@
public uint num_signal_watchers;
public void add_signal_watch ();
public void add_signal_watch_full (int priority);
- public uint add_watch (Gst.BusFunc func, pointer user_data);
- public uint add_watch_full (int priority, Gst.BusFunc func, pointer user_data, GLib.DestroyNotify notify);
+ public uint add_watch (Gst.BusFunc func);
+ public uint add_watch_full (int priority, Gst.BusFunc func, GLib.DestroyNotify notify);
public bool async_signal_func (Gst.Message message, pointer data);
public weak GLib.Source create_watch ();
public void disable_sync_message_emission ();
@@ -1324,16 +1324,16 @@
public weak Gst.IndexEntry add_format (int id, Gst.Format format);
public weak Gst.IndexEntry add_id (int id, string description);
public weak Gst.IndexEntry add_object (int id, string key, GLib.Type type, pointer object);
- public weak Gst.IndexEntry get_assoc_entry_full (int id, Gst.IndexLookupMethod method, Gst.AssocFlags flags, Gst.Format format, int64 value, GLib.CompareDataFunc func, pointer user_data);
+ public weak Gst.IndexEntry get_assoc_entry_full (int id, Gst.IndexLookupMethod method, Gst.AssocFlags flags, Gst.Format format, int64 value, GLib.CompareDataFunc func);
public Gst.IndexCertainty get_certainty ();
public int get_group ();
public Index ();
public Index.group (Gst.Index index);
public void set_certainty (Gst.IndexCertainty certainty);
- public void set_filter (Gst.IndexFilter filter, pointer user_data);
- public void set_filter_full (Gst.IndexFilter filter, pointer user_data, GLib.DestroyNotify user_data_destroy);
+ public void set_filter (Gst.IndexFilter filter);
+ public void set_filter_full (Gst.IndexFilter filter, GLib.DestroyNotify user_data_destroy);
public bool set_group (int groupnum);
- public void set_resolver (Gst.IndexResolver resolver, pointer user_data);
+ public void set_resolver (Gst.IndexResolver resolver);
[NoWrapper]
public virtual void add_entry (Gst.IndexEntry entry);
public virtual void commit (int id);
@@ -1481,7 +1481,7 @@
public void set_activatepush_function (Gst.PadActivateModeFunction activatepush);
public bool set_active (bool active);
public bool set_blocked (bool blocked);
- public bool set_blocked_async (bool blocked, Gst.PadBlockCallback callback, pointer user_data);
+ public bool set_blocked_async (bool blocked, Gst.PadBlockCallback callback);
public void set_bufferalloc_function (Gst.PadBufferAllocFunction bufalloc);
public bool set_caps (Gst.Caps caps);
public void set_chain_function (Gst.PadChainFunction chain);
@@ -1594,7 +1594,7 @@
public bool add_feature (Gst.PluginFeature feature);
public void add_path (string path);
public bool add_plugin (Gst.Plugin plugin);
- public weak GLib.List feature_filter (Gst.PluginFeatureFilter filter, bool first, pointer user_data);
+ public weak GLib.List feature_filter (Gst.PluginFeatureFilter filter, bool first);
public weak Gst.PluginFeature find_feature (string name, GLib.Type type);
public weak Gst.Plugin find_plugin (string name);
public static bool fork_is_enabled ();
@@ -1606,7 +1606,7 @@
public weak GLib.List get_plugin_list ();
public weak Gst.Plugin lookup (string filename);
public weak Gst.PluginFeature lookup_feature (string name);
- public weak GLib.List plugin_filter (Gst.PluginFilter filter, bool first, pointer user_data);
+ public weak GLib.List plugin_filter (Gst.PluginFilter filter, bool first);
public void remove_feature (Gst.PluginFeature feature);
public void remove_plugin (Gst.Plugin plugin);
public bool scan_path (string path);
@@ -1713,13 +1713,13 @@
}
public static delegate bool BusFunc (Gst.Bus bus, Gst.Message message, pointer data);
public static delegate Gst.BusSyncReply BusSyncHandler (Gst.Bus bus, Gst.Message message, pointer data);
- public static delegate bool ClockCallback (Gst.Clock clock, Gst.ClockTime time, Gst.ClockID id, pointer user_data);
+ public delegate bool ClockCallback (Gst.Clock clock, Gst.ClockTime time, Gst.ClockID id);
public static delegate void DebugFuncPtr ();
- public static delegate bool FilterFunc (pointer obj, pointer user_data);
- public static delegate bool IndexFilter (Gst.Index index, Gst.IndexEntry entry, pointer user_data);
- public static delegate bool IndexResolver (Gst.Index index, Gst.Object writer, string writer_string, pointer user_data);
+ public delegate bool FilterFunc (pointer obj);
+ public delegate bool IndexFilter (Gst.Index index, Gst.IndexEntry entry);
+ public delegate bool IndexResolver (Gst.Index index, Gst.Object writer, string writer_string);
public static delegate void IteratorDisposeFunction (pointer owner);
- public static delegate bool IteratorFoldFunction (pointer item, GLib.Value ret, pointer user_data);
+ public delegate bool IteratorFoldFunction (pointer item, GLib.Value ret);
public static delegate void IteratorFreeFunction (Gst.Iterator it);
public static delegate Gst.IteratorItem IteratorItemFunction (Gst.Iterator it, pointer item);
public static delegate Gst.IteratorResult IteratorNextFunction (Gst.Iterator it, pointer result);
@@ -1730,7 +1730,7 @@
public static delegate bool PadAcceptCapsFunction (Gst.Pad pad, Gst.Caps caps);
public static delegate bool PadActivateFunction (Gst.Pad pad);
public static delegate bool PadActivateModeFunction (Gst.Pad pad, bool active);
- public static delegate void PadBlockCallback (Gst.Pad pad, bool blocked, pointer user_data);
+ public delegate void PadBlockCallback (Gst.Pad pad, bool blocked);
public static delegate Gst.FlowReturn PadBufferAllocFunction (Gst.Pad pad, uint64 offset, uint size, Gst.Caps caps, out weak Gst.Buffer buf);
public static delegate Gst.FlowReturn PadChainFunction (Gst.Pad pad, Gst.Buffer buffer);
public static delegate bool PadCheckGetRangeFunction (Gst.Pad pad);
@@ -1745,12 +1745,12 @@
public static delegate Gst.QueryType PadQueryTypeFunction (Gst.Pad pad);
public static delegate bool PadSetCapsFunction (Gst.Pad pad, Gst.Caps caps);
public static delegate void PadUnlinkFunction (Gst.Pad pad);
- public static delegate bool PluginFeatureFilter (Gst.PluginFeature feature, pointer user_data);
- public static delegate bool PluginFilter (Gst.Plugin plugin, pointer user_data);
+ public delegate bool PluginFeatureFilter (Gst.PluginFeature feature);
+ public delegate bool PluginFilter (Gst.Plugin plugin);
public static delegate bool PluginInitFunc (Gst.Plugin plugin);
- public static delegate bool StructureForeachFunc (GLib.Quark field_id, GLib.Value value, pointer user_data);
- public static delegate bool StructureMapFunc (GLib.Quark field_id, GLib.Value value, pointer user_data);
- public static delegate void TagForeachFunc (Gst.TagList list, string tag, pointer user_data);
+ public delegate bool StructureForeachFunc (GLib.Quark field_id, GLib.Value value);
+ public delegate bool StructureMapFunc (GLib.Quark field_id, GLib.Value value);
+ public delegate void TagForeachFunc (Gst.TagList list, string tag);
public static delegate void TagMergeFunc (GLib.Value dest, GLib.Value src);
public static delegate void TaskFunction (pointer data);
public static delegate void TypeFindFunction (Gst.TypeFind find, pointer data);
@@ -1889,7 +1889,7 @@
[CCode (cheader_filename = "gst/gst.h")]
public static weak string error_get_message (GLib.Quark domain, int code);
[CCode (cheader_filename = "gst/gst.h")]
- public static weak GLib.List filter_run (GLib.List list, Gst.FilterFunc func, bool first, pointer user_data);
+ public static weak GLib.List filter_run (GLib.List list, Gst.FilterFunc func, bool first);
[CCode (cheader_filename = "gst/gst.h")]
public static weak string flow_get_name (Gst.FlowReturn ret);
[CCode (cheader_filename = "gst/gst.h")]
Modified: trunk/vapi/gstreamer-audio-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-audio-0.10.vapi (original)
+++ trunk/vapi/gstreamer-audio-0.10.vapi Sat Feb 23 17:49:14 2008
@@ -123,7 +123,7 @@
public Gst.AudioClockGetTimeFunc func;
public pointer user_data;
public weak Gst.ClockTime last_time;
- public AudioClock (string name, Gst.AudioClockGetTimeFunc func, pointer user_data);
+ public AudioClock (string name, Gst.AudioClockGetTimeFunc func);
}
[CCode (cheader_filename = "gst/audio/gstaudiofilter.h")]
public class AudioFilter : Gst.BaseTransform {
@@ -230,7 +230,7 @@
public bool prepare_read (int segment, uchar readptr, int len);
public uint read (uint64 sample, uchar[] data, uint len);
public uint64 samples_done ();
- public void set_callback (Gst.RingBufferCallback cb, pointer user_data);
+ public void set_callback (Gst.RingBufferCallback cb);
public void set_flushing (bool flushing);
public void set_sample (uint64 sample);
public virtual bool acquire (Gst.RingBufferSpec spec);
@@ -244,9 +244,9 @@
public virtual bool start ();
public virtual bool stop ();
}
- public static delegate weak Gst.ClockTime AudioClockGetTimeFunc (Gst.Clock clock, pointer user_data);
- public static delegate bool AudioMixerFilterFunc (Gst.Mixer mixer, pointer user_data);
- public static delegate void RingBufferCallback (Gst.RingBuffer rbuf, uchar data, uint len, pointer user_data);
+ public delegate weak Gst.ClockTime AudioClockGetTimeFunc (Gst.Clock clock);
+ public delegate bool AudioMixerFilterFunc (Gst.Mixer mixer);
+ public delegate void RingBufferCallback (Gst.RingBuffer rbuf, uchar data, uint len);
public const int AUDIO_DEF_RATE;
public const string AUDIO_FLOAT_PAD_TEMPLATE_CAPS;
public const string AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_CAPS;
@@ -255,7 +255,7 @@
[CCode (cheader_filename = "gst/audio/audio.h")]
public static weak Gst.Buffer audio_buffer_clip (Gst.Buffer buffer, Gst.Segment segment, int rate, int frame_size);
[CCode (cheader_filename = "gst/audio/audio.h")]
- public static weak GLib.List audio_default_registry_mixer_filter (Gst.AudioMixerFilterFunc filter_func, bool first, pointer user_data);
+ public static weak GLib.List audio_default_registry_mixer_filter (Gst.AudioMixerFilterFunc filter_func, bool first);
[CCode (cheader_filename = "gst/audio/audio.h")]
public static weak Gst.ClockTime audio_duration_from_pad_buffer (Gst.Pad pad, Gst.Buffer buf);
[CCode (cheader_filename = "gst/audio/audio.h")]
Modified: trunk/vapi/gstreamer-base-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-base-0.10.vapi (original)
+++ trunk/vapi/gstreamer-base-0.10.vapi Sat Feb 23 17:49:14 2008
@@ -274,7 +274,7 @@
public uint read (Gst.CollectData data, uchar bytes, uint size);
public bool remove_pad (Gst.Pad pad);
public void set_flushing (bool flushing);
- public void set_function (Gst.CollectPadsFunction func, pointer user_data);
+ public void set_function (Gst.CollectPadsFunction func);
public void start ();
public void stop ();
}
@@ -313,7 +313,7 @@
public virtual Gst.FlowReturn create (out weak Gst.Buffer buf);
}
public static delegate void CollectDataDestroyNotify (Gst.CollectData data);
- public static delegate Gst.FlowReturn CollectPadsFunction (Gst.CollectPads pads, pointer user_data);
+ public delegate Gst.FlowReturn CollectPadsFunction (Gst.CollectPads pads);
public static delegate bool DataQueueCheckFullFunction (Gst.DataQueue queue, uint visible, uint bytes, uint64 time, pointer checkdata);
public static delegate Gst.FlowReturn TypeFindHelperGetRangeFunction (Gst.Object obj, uint64 offset, uint length, out weak Gst.Buffer buffer);
public const string BASE_TRANSFORM_SINK_NAME;
Modified: trunk/vapi/gstreamer-pbutils-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-pbutils-0.10.vapi (original)
+++ trunk/vapi/gstreamer-pbutils-0.10.vapi Sat Feb 23 17:49:14 2008
@@ -21,9 +21,9 @@
public InstallPluginsContext ();
public void set_xid (uint xid);
}
- public static delegate void InstallPluginsResultFunc (Gst.InstallPluginsReturn result, pointer user_data);
+ public delegate void InstallPluginsResultFunc (Gst.InstallPluginsReturn result);
[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
- public static Gst.InstallPluginsReturn install_plugins_async (string details, Gst.InstallPluginsContext ctx, Gst.InstallPluginsResultFunc func, pointer user_data);
+ public static Gst.InstallPluginsReturn install_plugins_async (string details, Gst.InstallPluginsContext ctx, Gst.InstallPluginsResultFunc func);
[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
public static bool install_plugins_installation_in_progress ();
[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
Modified: trunk/vapi/gtk+-2.0.vapi
==============================================================================
--- trunk/vapi/gtk+-2.0.vapi (original)
+++ trunk/vapi/gtk+-2.0.vapi Sat Feb 23 17:49:14 2008
@@ -1817,12 +1817,12 @@
public class ActionGroup : GLib.Object, Gtk.Buildable {
public void add_action (Gtk.Action action);
public void add_action_with_accel (Gtk.Action action, string accelerator);
- public void add_actions (Gtk.ActionEntry[] entries, pointer user_data);
- public void add_actions_full (Gtk.ActionEntry[] entries, pointer user_data, GLib.DestroyNotify destroy);
- public void add_radio_actions (Gtk.RadioActionEntry[] entries, int value, GLib.Callback on_change, pointer user_data);
- public void add_radio_actions_full (Gtk.RadioActionEntry[] entries, int value, GLib.Callback on_change, pointer user_data, GLib.DestroyNotify destroy);
- public void add_toggle_actions (Gtk.ToggleActionEntry[] entries, pointer user_data);
- public void add_toggle_actions_full (Gtk.ToggleActionEntry[] entries, pointer user_data, GLib.DestroyNotify destroy);
+ public void add_actions (Gtk.ActionEntry[] entries);
+ public void add_actions_full (Gtk.ActionEntry[] entries, GLib.DestroyNotify destroy);
+ public void add_radio_actions (Gtk.RadioActionEntry[] entries, int value, GLib.Callback on_change);
+ public void add_radio_actions_full (Gtk.RadioActionEntry[] entries, int value, GLib.Callback on_change, GLib.DestroyNotify destroy);
+ public void add_toggle_actions (Gtk.ToggleActionEntry[] entries);
+ public void add_toggle_actions_full (Gtk.ToggleActionEntry[] entries, GLib.DestroyNotify destroy);
public weak string get_name ();
public bool get_sensitive ();
public bool get_visible ();
@@ -1971,7 +1971,7 @@
public uint add_from_file (string filename) throws GLib.Error;
public uint add_from_string (string buffer, ulong length) throws GLib.Error;
public void connect_signals (pointer user_data);
- public void connect_signals_full (Gtk.BuilderConnectFunc func, pointer user_data);
+ public void connect_signals_full (Gtk.BuilderConnectFunc func);
public static GLib.Quark error_quark ();
public weak GLib.Object get_object (string name);
public weak GLib.SList get_objects ();
@@ -2389,15 +2389,15 @@
public weak Gdk.Display get_display ();
public static weak Gtk.Clipboard get_for_display (Gdk.Display display, Gdk.Atom selection);
public weak GLib.Object get_owner ();
- public void request_contents (Gdk.Atom target, Gtk.ClipboardReceivedFunc callback, pointer user_data);
- public void request_image (Gtk.ClipboardImageReceivedFunc callback, pointer user_data);
- public void request_rich_text (Gtk.TextBuffer buffer, Gtk.ClipboardRichTextReceivedFunc callback, pointer user_data);
- public void request_targets (Gtk.ClipboardTargetsReceivedFunc callback, pointer user_data);
- public void request_text (Gtk.ClipboardTextReceivedFunc callback, pointer user_data);
+ public void request_contents (Gdk.Atom target, Gtk.ClipboardReceivedFunc callback);
+ public void request_image (Gtk.ClipboardImageReceivedFunc callback);
+ public void request_rich_text (Gtk.TextBuffer buffer, Gtk.ClipboardRichTextReceivedFunc callback);
+ public void request_targets (Gtk.ClipboardTargetsReceivedFunc callback);
+ public void request_text (Gtk.ClipboardTextReceivedFunc callback);
public void set_can_store (Gtk.TargetEntry[] targets);
public void set_image (Gdk.Pixbuf pixbuf);
public void set_text (string text, int len);
- public bool set_with_data (Gtk.TargetEntry[] targets, Gtk.ClipboardGetFunc get_func, Gtk.ClipboardClearFunc clear_func, pointer user_data);
+ 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 weak Gtk.SelectionData wait_for_contents (Gdk.Atom target);
@@ -3857,7 +3857,7 @@
[CCode (cheader_filename = "gtk/gtk.h")]
public class PrintSettings : GLib.Object {
public weak Gtk.PrintSettings copy ();
- public void @foreach (Gtk.PrintSettingsFunc func, pointer user_data);
+ public void @foreach (Gtk.PrintSettingsFunc func);
public weak string get (string key);
public bool get_bool (string key);
public bool get_collate ();
@@ -4491,7 +4491,7 @@
public StatusIcon.from_icon_name (string icon_name);
public StatusIcon.from_pixbuf (Gdk.Pixbuf pixbuf);
public StatusIcon.from_stock (string stock_id);
- public static void position_menu (Gtk.Menu menu, int x, int y, bool push_in, pointer user_data);
+ public static void position_menu (Gtk.Menu menu, int x, int y, bool push_in);
public void set_blinking (bool blinking);
public void set_from_file (string filename);
public void set_from_icon_name (string icon_name);
@@ -4746,9 +4746,9 @@
public TextBuffer (Gtk.TextTagTable table);
public void paste_clipboard (Gtk.Clipboard clipboard, Gtk.TextIter override_location, bool default_editable);
public void place_cursor (Gtk.TextIter where);
- public Gdk.Atom register_deserialize_format (string mime_type, Gtk.TextBufferDeserializeFunc function, pointer user_data, GLib.DestroyNotify user_data_destroy);
+ public Gdk.Atom register_deserialize_format (string mime_type, Gtk.TextBufferDeserializeFunc function, GLib.DestroyNotify user_data_destroy);
public Gdk.Atom register_deserialize_tagset (string tagset_name);
- public Gdk.Atom register_serialize_format (string mime_type, Gtk.TextBufferSerializeFunc function, pointer user_data, GLib.DestroyNotify user_data_destroy);
+ public Gdk.Atom register_serialize_format (string mime_type, Gtk.TextBufferSerializeFunc function, GLib.DestroyNotify user_data_destroy);
public Gdk.Atom register_serialize_tagset (string tagset_name);
public void remove_all_tags (Gtk.TextIter start, Gtk.TextIter end);
public void remove_selection_clipboard (Gtk.Clipboard clipboard);
@@ -5425,7 +5425,7 @@
public int remove_column (Gtk.TreeViewColumn column);
public void scroll_to_cell (Gtk.TreePath path, Gtk.TreeViewColumn column, bool use_align, float row_align, float col_align);
public void scroll_to_point (int tree_x, int tree_y);
- public void set_column_drag_function (Gtk.TreeViewColumnDropFunc func, pointer user_data, Gtk.DestroyNotify destroy);
+ public void set_column_drag_function (Gtk.TreeViewColumnDropFunc func, Gtk.DestroyNotify destroy);
public void set_cursor (Gtk.TreePath path, Gtk.TreeViewColumn focus_column, bool start_editing);
public void set_cursor_on_cell (Gtk.TreePath path, Gtk.TreeViewColumn focus_column, Gtk.CellRenderer focus_cell, bool start_editing);
public void set_destroy_count_func (Gtk.TreeDestroyCountFunc func, pointer data, Gtk.DestroyNotify destroy);
@@ -6039,7 +6039,7 @@
}
[CCode (cheader_filename = "gtk/gtk.h")]
public interface TreeModel : GLib.Object {
- public void @foreach (Gtk.TreeModelForeachFunc func, pointer user_data);
+ public void @foreach (Gtk.TreeModelForeachFunc func);
[CCode (sentinel = "-1")]
public void get (Gtk.TreeIter iter, ...);
public bool get_iter_first (out Gtk.TreeIter iter);
@@ -6075,9 +6075,9 @@
public interface TreeSortable : Gtk.TreeModel, GLib.Object {
public abstract bool get_sort_column_id (int sort_column_id, Gtk.SortType order);
public abstract bool has_default_sort_func ();
- public abstract void set_default_sort_func (Gtk.TreeIterCompareFunc sort_func, pointer user_data, Gtk.DestroyNotify destroy);
+ public abstract void set_default_sort_func (Gtk.TreeIterCompareFunc sort_func, Gtk.DestroyNotify destroy);
public abstract void set_sort_column_id (int sort_column_id, Gtk.SortType order);
- public abstract void set_sort_func (int sort_column_id, Gtk.TreeIterCompareFunc sort_func, pointer user_data, Gtk.DestroyNotify destroy);
+ public abstract void set_sort_func (int sort_column_id, Gtk.TreeIterCompareFunc sort_func, Gtk.DestroyNotify destroy);
[HasEmitter]
public signal void sort_column_changed ();
}
@@ -6169,7 +6169,7 @@
public bool backward_chars (int count);
public bool backward_cursor_position ();
public bool backward_cursor_positions (int count);
- public bool backward_find_char (Gtk.TextCharPredicate pred, pointer user_data, Gtk.TextIter limit);
+ public bool backward_find_char (Gtk.TextCharPredicate pred, Gtk.TextIter limit);
public bool backward_line ();
public bool backward_lines (int count);
public bool backward_search (string str, Gtk.TextSearchFlags flags, Gtk.TextIter match_start, Gtk.TextIter match_end, Gtk.TextIter limit);
@@ -6198,7 +6198,7 @@
public bool forward_chars (int count);
public bool forward_cursor_position ();
public bool forward_cursor_positions (int count);
- public bool forward_find_char (Gtk.TextCharPredicate pred, pointer user_data, Gtk.TextIter limit);
+ public bool forward_find_char (Gtk.TextCharPredicate pred, Gtk.TextIter limit);
public bool forward_line ();
public bool forward_lines (int count);
public bool forward_search (string str, Gtk.TextSearchFlags flags, Gtk.TextIter match_start, Gtk.TextIter match_end, Gtk.TextIter limit);
@@ -6271,7 +6271,7 @@
public static delegate bool AccelGroupFindFunc (Gtk.AccelKey key, GLib.Closure closure, pointer data);
public static delegate void AccelMapForeach (pointer data, string accel_path, uint accel_key, Gdk.ModifierType accel_mods, bool changed);
public static delegate int AssistantPageFunc (int current_page, pointer data);
- public static delegate void BuilderConnectFunc (Gtk.Builder builder, GLib.Object object, string signal_name, string handler_name, GLib.Object connect_object, GLib.ConnectFlags flags, pointer user_data);
+ public delegate void BuilderConnectFunc (Gtk.Builder builder, GLib.Object object, string signal_name, string handler_name, GLib.Object connect_object, GLib.ConnectFlags flags);
public static delegate void Callback (Gtk.Widget widget, pointer data);
public static delegate void CellLayoutDataFunc (Gtk.CellLayout cell_layout, Gtk.CellRenderer cell, Gtk.TreeModel tree_model, Gtk.TreeIter iter, pointer data);
public static delegate void ClipboardClearFunc (Gtk.Clipboard clipboard, pointer user_data_or_owner);
@@ -6284,41 +6284,41 @@
public static delegate void ColorSelectionChangePaletteFunc (Gdk.Color colors, int n_colors);
public static delegate void ColorSelectionChangePaletteWithScreenFunc (Gdk.Screen screen, Gdk.Color colors, int n_colors);
public static delegate void DestroyNotify (pointer data);
- public static delegate bool EntryCompletionMatchFunc (Gtk.EntryCompletion completion, string key, Gtk.TreeIter iter, pointer user_data);
+ public delegate bool EntryCompletionMatchFunc (Gtk.EntryCompletion completion, string key, Gtk.TreeIter iter);
public static delegate bool FileFilterFunc (Gtk.FileFilterInfo filter_info, pointer data);
public static delegate bool Function (pointer data);
public static delegate void IconViewForeachFunc (Gtk.IconView icon_view, Gtk.TreePath path, pointer data);
public static delegate int KeySnoopFunc (Gtk.Widget grab_widget, Gdk.EventKey event, pointer func_data);
- public static delegate void LinkButtonUriFunc (Gtk.LinkButton button, string link_, pointer user_data);
+ public delegate void LinkButtonUriFunc (Gtk.LinkButton button, string link_);
public static delegate void MenuDetachFunc (Gtk.Widget attach_widget, Gtk.Menu menu);
- public static delegate void MenuPositionFunc (Gtk.Menu menu, int x, int y, bool push_in, pointer user_data);
+ public delegate void MenuPositionFunc (Gtk.Menu menu, int x, int y, bool push_in);
public static delegate void ModuleDisplayInitFunc (Gdk.Display display);
public static delegate void ModuleInitFunc (int argc, string argv);
public static delegate weak Gtk.Notebook NotebookWindowCreationFunc (Gtk.Notebook source, Gtk.Widget page, int x, int y, pointer data);
public static delegate void PageSetupDoneFunc (Gtk.PageSetup page_setup, pointer data);
- public static delegate void PrintSettingsFunc (string key, string value, pointer user_data);
+ public delegate void PrintSettingsFunc (string key, string value);
public static delegate bool RcPropertyParser (GLib.ParamSpec pspec, GLib.StringBuilder rc_string, GLib.Value property_value);
- public static delegate bool RecentFilterFunc (Gtk.RecentFilterInfo filter_info, pointer user_data);
- public static delegate int RecentSortFunc (Gtk.RecentInfo a, Gtk.RecentInfo b, pointer user_data);
+ public delegate bool RecentFilterFunc (Gtk.RecentFilterInfo filter_info);
+ public delegate int RecentSortFunc (Gtk.RecentInfo a, Gtk.RecentInfo b);
public static delegate void SignalFunc ();
- public static delegate bool TextBufferDeserializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, Gtk.TextIter iter, uchar data, ulong length, bool create_tags, pointer user_data, GLib.Error error);
- public static delegate uchar TextBufferSerializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, Gtk.TextIter start, Gtk.TextIter end, ulong length, pointer user_data);
- public static delegate bool TextCharPredicate (unichar ch, pointer user_data);
+ public delegate bool TextBufferDeserializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, Gtk.TextIter iter, uchar data, ulong length, bool create_tags, GLib.Error error);
+ public delegate uchar TextBufferSerializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, Gtk.TextIter start, Gtk.TextIter end, ulong length);
+ public delegate bool TextCharPredicate (unichar ch);
public static delegate void TextTagTableForeach (Gtk.TextTag tag, pointer data);
public static delegate weak string TranslateFunc (string path, pointer func_data);
public static delegate void TreeCellDataFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel tree_model, Gtk.TreeIter iter, pointer data);
- public static delegate void TreeDestroyCountFunc (Gtk.TreeView tree_view, Gtk.TreePath path, int children, pointer user_data);
- public static delegate int TreeIterCompareFunc (Gtk.TreeModel model, Gtk.TreeIter a, Gtk.TreeIter b, pointer user_data);
+ public delegate void TreeDestroyCountFunc (Gtk.TreeView tree_view, Gtk.TreePath path, int children);
+ public delegate int TreeIterCompareFunc (Gtk.TreeModel model, Gtk.TreeIter a, Gtk.TreeIter b);
public static delegate void TreeModelFilterModifyFunc (Gtk.TreeModel model, Gtk.TreeIter iter, GLib.Value value, int column, pointer data);
public static delegate bool TreeModelFilterVisibleFunc (Gtk.TreeModel model, Gtk.TreeIter iter, pointer data);
public static delegate bool TreeModelForeachFunc (Gtk.TreeModel model, Gtk.TreePath path, Gtk.TreeIter iter, pointer data);
public static delegate void TreeSelectionForeachFunc (Gtk.TreeModel model, Gtk.TreePath path, Gtk.TreeIter iter, pointer data);
public static delegate bool TreeSelectionFunc (Gtk.TreeSelection selection, Gtk.TreeModel model, Gtk.TreePath path, bool path_currently_selected, pointer data);
public static delegate bool TreeViewColumnDropFunc (Gtk.TreeView tree_view, Gtk.TreeViewColumn column, Gtk.TreeViewColumn prev_column, Gtk.TreeViewColumn next_column, pointer data);
- public static delegate void TreeViewMappingFunc (Gtk.TreeView tree_view, Gtk.TreePath path, pointer user_data);
+ public delegate void TreeViewMappingFunc (Gtk.TreeView tree_view, Gtk.TreePath path);
public static delegate bool TreeViewRowSeparatorFunc (Gtk.TreeModel model, Gtk.TreeIter iter, pointer data);
public static delegate bool TreeViewSearchEqualFunc (Gtk.TreeModel model, int column, string key, Gtk.TreeIter iter, pointer search_data);
- public static delegate void TreeViewSearchPositionFunc (Gtk.TreeView tree_view, Gtk.Widget search_dialog, pointer user_data);
+ public delegate void TreeViewSearchPositionFunc (Gtk.TreeView tree_view, Gtk.Widget search_dialog);
public static delegate void WindowKeysForeachFunc (Gtk.Window window, uint keyval, Gdk.ModifierType modifiers, bool is_mnemonic, pointer data);
public const int ARG_READWRITE;
public const int BINARY_AGE;
Modified: trunk/vapi/libglade-2.0.vapi
==============================================================================
--- trunk/vapi/libglade-2.0.vapi (original)
+++ trunk/vapi/libglade-2.0.vapi Sat Feb 23 17:49:14 2008
@@ -86,10 +86,10 @@
public void set_toplevel (Gtk.Window window);
public bool set_value_from_string (GLib.ParamSpec pspec, string string, GLib.Value value);
public void signal_autoconnect ();
- public void signal_autoconnect_full (Glade.XMLConnectFunc func, pointer user_data);
+ public void signal_autoconnect_full (Glade.XMLConnectFunc func);
public void signal_connect (string handlername, GLib.Callback func);
- public void signal_connect_data (string handlername, GLib.Callback func, pointer user_data);
- public void signal_connect_full (string handler_name, Glade.XMLConnectFunc func, pointer user_data);
+ public void signal_connect_data (string handlername, GLib.Callback func);
+ public void signal_connect_full (string handler_name, Glade.XMLConnectFunc func);
[NoWrapper]
public virtual GLib.Type lookup_type (string gtypename);
}
@@ -97,8 +97,8 @@
public static delegate void BuildChildrenFunc (Glade.XML xml, Gtk.Widget parent, Glade.WidgetInfo info);
public static delegate weak Gtk.Widget FindInternalChildFunc (Glade.XML xml, Gtk.Widget parent, string childname);
public static delegate weak Gtk.Widget NewFunc (Glade.XML xml, GLib.Type widget_type, Glade.WidgetInfo info);
- public static delegate void XMLConnectFunc (string handler_name, GLib.Object object, string signal_name, string signal_data, GLib.Object connect_object, bool after, pointer user_data);
- public static delegate weak Gtk.Widget XMLCustomWidgetHandler (Glade.XML xml, string func_name, string name, string string1, string string2, int int1, int int2, pointer user_data);
+ public delegate void XMLConnectFunc (string handler_name, GLib.Object object, string signal_name, string signal_data, GLib.Object connect_object, bool after);
+ public delegate weak Gtk.Widget XMLCustomWidgetHandler (Glade.XML xml, string func_name, string name, string string1, string string2, int int1, int int2);
public const int MODULE_API_VERSION;
[CCode (cheader_filename = "glade/glade.h")]
public static int enum_from_string (GLib.Type type, string string);
@@ -127,7 +127,7 @@
[CCode (cheader_filename = "glade/glade.h")]
public static void require (string library);
[CCode (cheader_filename = "glade/glade.h")]
- public static void set_custom_handler (Glade.XMLCustomWidgetHandler handler, pointer user_data);
+ public static void set_custom_handler (Glade.XMLCustomWidgetHandler handler);
[CCode (cheader_filename = "glade/glade.h")]
public static void standard_build_children (Glade.XML self, Gtk.Widget parent, Glade.WidgetInfo info);
[CCode (cheader_filename = "glade/glade.h")]
Modified: trunk/vapi/libgnome-menu.vapi
==============================================================================
--- trunk/vapi/libgnome-menu.vapi (original)
+++ trunk/vapi/libgnome-menu.vapi Sat Feb 23 17:49:14 2008
@@ -29,13 +29,13 @@
}
[CCode (ref_function = "gmenu_tree_ref", unref_function = "gmenu_tree_unref", cheader_filename = "gnome-menus/gmenu-tree.h")]
public class Tree {
- public void add_monitor (GMenu.TreeChangedFunc callback, pointer user_data);
+ public void add_monitor (GMenu.TreeChangedFunc callback);
public weak GMenu.TreeDirectory get_directory_from_path (string path);
public weak string get_menu_file ();
public weak GMenu.TreeDirectory get_root_directory ();
public pointer get_user_data ();
public static weak GMenu.Tree lookup (string menu_file, GMenu.TreeFlags flags);
- public void remove_monitor (GMenu.TreeChangedFunc callback, pointer user_data);
+ public void remove_monitor (GMenu.TreeChangedFunc callback);
public void set_user_data (pointer user_data, GLib.DestroyNotify dnotify);
}
[CCode (cheader_filename = "gnome-menus/gmenu-tree.h")]
@@ -74,5 +74,5 @@
[CCode (cheader_filename = "gnome-menus/gmenu-tree.h")]
public class TreeSeparator : GMenu.TreeItem {
}
- public static delegate void TreeChangedFunc (GMenu.Tree tree, pointer user_data);
+ public delegate void TreeChangedFunc (GMenu.Tree tree);
}
Modified: trunk/vapi/libgnomeui-2.0.vapi
==============================================================================
--- trunk/vapi/libgnomeui-2.0.vapi (original)
+++ trunk/vapi/libgnomeui-2.0.vapi Sat Feb 23 17:49:14 2008
@@ -210,18 +210,18 @@
public void create_menus (Gnome.UIInfo uiinfo);
public void create_menus_custom (Gnome.UIInfo uiinfo, Gnome.UIBuilderData uibdata);
public void create_menus_interp (Gnome.UIInfo uiinfo, Gtk.CallbackMarshal relay_func, pointer data, Gtk.DestroyNotify destroy_func);
- public void create_menus_with_data (Gnome.UIInfo uiinfo, pointer user_data);
+ public void create_menus_with_data (Gnome.UIInfo uiinfo);
public void create_toolbar (Gnome.UIInfo uiinfo);
public void create_toolbar_custom (Gnome.UIInfo uiinfo, Gnome.UIBuilderData uibdata);
public void create_toolbar_interp (Gnome.UIInfo uiinfo, Gtk.CallbackMarshal relay_func, pointer data, Gtk.DestroyNotify destroy_func);
- public void create_toolbar_with_data (Gnome.UIInfo uiinfo, pointer user_data);
+ public void create_toolbar_with_data (Gnome.UIInfo uiinfo);
public void enable_layout_config (bool enable);
public static void fill_menu (Gtk.MenuShell menu_shell, Gnome.UIInfo uiinfo, Gtk.AccelGroup accel_group, bool uline_accels, int pos);
public static void fill_menu_custom (Gtk.MenuShell menu_shell, Gnome.UIInfo uiinfo, Gnome.UIBuilderData uibdata, Gtk.AccelGroup accel_group, bool uline_accels, int pos);
- public static void fill_menu_with_data (Gtk.MenuShell menu_shell, Gnome.UIInfo uiinfo, Gtk.AccelGroup accel_group, bool uline_accels, int pos, pointer user_data);
+ public static void fill_menu_with_data (Gtk.MenuShell menu_shell, Gnome.UIInfo uiinfo, Gtk.AccelGroup accel_group, bool uline_accels, int pos);
public static void fill_toolbar (Gtk.Toolbar toolbar, Gnome.UIInfo uiinfo, Gtk.AccelGroup accel_group);
public static void fill_toolbar_custom (Gtk.Toolbar toolbar, Gnome.UIInfo uiinfo, Gnome.UIBuilderData uibdata, Gtk.AccelGroup accel_group);
- public static void fill_toolbar_with_data (Gtk.Toolbar toolbar, Gnome.UIInfo uiinfo, Gtk.AccelGroup accel_group, pointer user_data);
+ public static void fill_toolbar_with_data (Gtk.Toolbar toolbar, Gnome.UIInfo uiinfo, Gtk.AccelGroup accel_group);
public static weak Gtk.Widget find_menu_pos (Gtk.Widget parent, string path, int pos);
public static weak string helper_gettext (string string);
public void insert_menus (string path, Gnome.UIInfo menuinfo);
@@ -483,7 +483,7 @@
public static delegate void GdkPixbufDoneCallback (Gnome.GdkPixbufAsyncHandle handle, pointer cb_data);
public static delegate void GdkPixbufLoadCallback (Gnome.GdkPixbufAsyncHandle handle, GnomeVFS.Result error, Gdk.Pixbuf pixbuf, pointer cb_data);
public static delegate void InteractFunction (Gnome.Client client, int key, Gnome.DialogType dialog_type, pointer data);
- public static delegate double PasswordDialogQualityFunc (Gnome.PasswordDialog password_dialog, string password, pointer user_data);
+ public delegate double PasswordDialogQualityFunc (Gnome.PasswordDialog password_dialog, string password);
public static delegate void ReplyCallback (int reply, pointer data);
public static delegate void StringCallback (string string, pointer data);
public static delegate void UISignalConnectFunc (Gnome.UIInfo uiinfo, string signal_name, Gnome.UIBuilderData uibdata);
Modified: trunk/vapi/libnotify.vapi
==============================================================================
--- trunk/vapi/libnotify.vapi (original)
+++ trunk/vapi/libnotify.vapi Sat Feb 23 17:49:14 2008
@@ -10,7 +10,7 @@
}
[CCode (cheader_filename = "libnotify/notify.h")]
public class Notification : GLib.Object {
- public void add_action (string action, string label, Notify.ActionCallback callback, pointer user_data, GLib.FreeFunc free_func);
+ public void add_action (string action, string label, Notify.ActionCallback callback, GLib.FreeFunc free_func);
public void attach_to_status_icon (Gtk.StatusIcon status_icon);
public void attach_to_widget (Gtk.Widget attach);
public void clear_actions ();
Modified: trunk/vapi/libsoup-2.2.vapi
==============================================================================
--- trunk/vapi/libsoup-2.2.vapi (original)
+++ trunk/vapi/libsoup-2.2.vapi Sat Feb 23 17:49:14 2008
@@ -295,14 +295,14 @@
public pointer get_sockaddr (int len);
public Address (string name, uint port);
public Address.any (Soup.AddressFamily family, uint port);
- public void resolve_async (Soup.AddressCallback callback, pointer user_data);
- public void resolve_async_full (GLib.MainContext async_context, Soup.AddressCallback callback, pointer user_data);
+ public void resolve_async (Soup.AddressCallback callback);
+ public void resolve_async_full (GLib.MainContext async_context, Soup.AddressCallback callback);
public uint resolve_sync ();
public signal void dns_result (int status);
}
[CCode (cheader_filename = "libsoup/soup.h")]
public class Connection : GLib.Object {
- public void connect_async (Soup.ConnectionCallback callback, pointer user_data);
+ public void connect_async (Soup.ConnectionCallback callback);
public uint connect_sync ();
public void disconnect ();
public bool is_in_use ();
@@ -342,11 +342,11 @@
public Soup.MessageStatus status;
public void add_chunk (Soup.Ownership owner, string# body, uint length);
public void add_final_chunk ();
- public void add_handler (Soup.HandlerPhase phase, Soup.MessageCallbackFn handler_cb, pointer user_data);
+ public void add_handler (Soup.HandlerPhase phase, Soup.MessageCallbackFn handler_cb);
public static void add_header (GLib.HashTable hash, string name, string value);
- public void add_header_handler (string header, Soup.HandlerPhase phase, Soup.MessageCallbackFn handler_cb, pointer user_data);
- public void add_status_class_handler (Soup.StatusClass status_class, Soup.HandlerPhase phase, Soup.MessageCallbackFn handler_cb, pointer user_data);
- public void add_status_code_handler (uint status_code, Soup.HandlerPhase phase, Soup.MessageCallbackFn handler_cb, pointer user_data);
+ public void add_header_handler (string header, Soup.HandlerPhase phase, Soup.MessageCallbackFn handler_cb);
+ public void add_status_class_handler (Soup.StatusClass status_class, Soup.HandlerPhase phase, Soup.MessageCallbackFn handler_cb);
+ public void add_status_code_handler (uint status_code, Soup.HandlerPhase phase, Soup.MessageCallbackFn handler_cb);
public static void clear_headers (GLib.HashTable hash);
public uint get_flags ();
public static weak string get_header (GLib.HashTable hash, string name);
@@ -363,7 +363,7 @@
public Message (string method, string uri_string);
public Message.from_uri (string method, Soup.Uri uri);
public void read_request (Soup.Socket sock);
- public void remove_handler (Soup.HandlerPhase phase, Soup.MessageCallbackFn handler_cb, pointer user_data);
+ public void remove_handler (Soup.HandlerPhase phase, Soup.MessageCallbackFn handler_cb);
public static void remove_header (GLib.HashTable hash, string name);
public void send_request (Soup.Socket sock, bool is_via_proxy);
public void set_flags (uint flags);
@@ -440,7 +440,7 @@
public void remove_filter (Soup.MessageFilter filter);
public bool try_prune_connection ();
public virtual void cancel_message (Soup.Message msg);
- public virtual void queue_message (Soup.Message# msg, Soup.MessageCallbackFn callback, pointer user_data);
+ public virtual void queue_message (Soup.Message# msg, Soup.MessageCallbackFn callback);
public virtual void requeue_message (Soup.Message msg);
public virtual uint send_message (Soup.Message msg);
[NoAccessorMethod]
@@ -472,7 +472,7 @@
}
[CCode (cheader_filename = "libsoup/soup.h")]
public class Socket : GLib.Object {
- public static weak Soup.Socket client_new_async (string hostname, uint port, pointer ssl_creds, Soup.SocketCallback callback, pointer user_data);
+ public static weak Soup.Socket client_new_async (string hostname, uint port, pointer ssl_creds, Soup.SocketCallback callback);
public static weak Soup.Socket client_new_sync (string hostname, uint port, pointer ssl_creds, uint status_ret);
public uint connect (Soup.Address remote_addr);
public void disconnect ();
@@ -483,7 +483,7 @@
public Socket (string optname1);
public Soup.SocketIOStatus read (pointer buffer, ulong len, ulong nread);
public Soup.SocketIOStatus read_until (pointer buffer, ulong len, pointer boundary, ulong boundary_len, ulong nread, bool got_boundary);
- public static weak Soup.Socket server_new (Soup.Address local_addr, pointer ssl_creds, Soup.SocketListenerCallback callback, pointer user_data);
+ public static weak Soup.Socket server_new (Soup.Address local_addr, pointer ssl_creds, Soup.SocketListenerCallback callback);
public bool start_proxy_ssl (string ssl_host);
public bool start_ssl ();
public Soup.SocketIOStatus write (pointer buffer, ulong len, ulong nwrote);
@@ -530,12 +530,12 @@
}
public static delegate void AddressCallback (Soup.Address addr, uint status, pointer data);
public static delegate void ConnectionCallback (Soup.Connection conn, uint status, pointer data);
- public static delegate void MessageCallbackFn (Soup.Message req, pointer user_data);
+ public delegate void MessageCallbackFn (Soup.Message req);
public static delegate bool ServerAuthCallbackFn (Soup.ServerAuthContext auth_ctx, Soup.ServerAuth auth, Soup.Message msg, pointer data);
- public static delegate void ServerCallbackFn (Soup.ServerContext context, Soup.Message msg, pointer user_data);
- public static delegate void ServerUnregisterFn (Soup.Server server, Soup.ServerHandler handler, pointer user_data);
- public static delegate void SocketCallback (Soup.Socket sock, uint status, pointer user_data);
- public static delegate void SocketListenerCallback (Soup.Socket listener, Soup.Socket sock, pointer user_data);
+ public delegate void ServerCallbackFn (Soup.ServerContext context, Soup.Message msg);
+ public delegate void ServerUnregisterFn (Soup.Server server, Soup.ServerHandler handler);
+ public delegate void SocketCallback (Soup.Socket sock, uint status);
+ public delegate void SocketListenerCallback (Soup.Socket listener, Soup.Socket sock);
public const int ADDRESS_ANY_PORT;
public const string CONNECTION_ASYNC_CONTEXT;
public const int CONNECTION_H;
Modified: trunk/vapi/libsoup-2.4.vapi
==============================================================================
--- trunk/vapi/libsoup-2.4.vapi (original)
+++ trunk/vapi/libsoup-2.4.vapi Sat Feb 23 17:49:14 2008
@@ -220,7 +220,7 @@
public class MessageHeaders : GLib.Boxed {
public void append (string name, string value);
public void clear ();
- public void @foreach (Soup.MessageHeadersForeachFunc func, pointer user_data);
+ public void @foreach (Soup.MessageHeadersForeachFunc func);
public weak string get (string name);
public int64 get_content_length ();
public Soup.Encoding get_encoding ();
@@ -271,7 +271,7 @@
public Address (string name, uint port);
public Address.any (Soup.AddressFamily family, uint port);
public Address.from_sockaddr (pointer sa, int len);
- public void resolve_async (GLib.MainContext async_context, GLib.Cancellable cancellable, Soup.AddressCallback callback, pointer user_data);
+ public void resolve_async (GLib.MainContext async_context, GLib.Cancellable cancellable, Soup.AddressCallback callback);
public uint resolve_sync (GLib.Cancellable cancellable);
[NoAccessorMethod]
public weak Soup.AddressFamily family { get; construct; }
@@ -333,7 +333,7 @@
[CCode (cheader_filename = "libsoup/soup.h")]
public class AuthDomainBasic : Soup.AuthDomain {
public AuthDomainBasic (string optname1);
- public static void set_auth_callback (Soup.AuthDomain domain, Soup.AuthDomainBasicAuthCallback callback, pointer user_data, GLib.DestroyNotify dnotify);
+ public static void set_auth_callback (Soup.AuthDomain domain, Soup.AuthDomainBasicAuthCallback callback, GLib.DestroyNotify dnotify);
[NoAccessorMethod]
public weak pointer auth_callback { get; set; }
[NoAccessorMethod]
@@ -343,7 +343,7 @@
public class AuthDomainDigest : Soup.AuthDomain {
public static weak string encode_password (string username, string realm, string password);
public AuthDomainDigest (string optname1);
- public static void set_auth_callback (Soup.AuthDomain domain, Soup.AuthDomainDigestAuthCallback callback, pointer user_data, GLib.DestroyNotify dnotify);
+ public static void set_auth_callback (Soup.AuthDomain domain, Soup.AuthDomainDigestAuthCallback callback, GLib.DestroyNotify dnotify);
[NoAccessorMethod]
public weak pointer auth_callback { get; set; }
[NoAccessorMethod]
@@ -364,15 +364,15 @@
public weak Soup.MessageHeaders request_headers;
public weak Soup.MessageBody response_body;
public weak Soup.MessageHeaders response_headers;
- public uint add_header_handler (string @signal, string header, GLib.Callback callback, pointer user_data);
- public uint add_status_code_handler (string @signal, uint status_code, GLib.Callback callback, pointer user_data);
+ public uint add_header_handler (string @signal, string header, GLib.Callback callback);
+ public uint add_status_code_handler (string @signal, uint status_code, GLib.Callback callback);
public Soup.MessageFlags get_flags ();
public Soup.HTTPVersion get_http_version ();
public weak Soup.URI get_uri ();
public bool is_keepalive ();
public Message (string method, string uri_string);
public Message.from_uri (string method, Soup.URI uri);
- public void set_chunk_allocator (Soup.ChunkAllocator allocator, pointer user_data, GLib.DestroyNotify destroy_notify);
+ public void set_chunk_allocator (Soup.ChunkAllocator allocator, GLib.DestroyNotify destroy_notify);
public void set_flags (Soup.MessageFlags flags);
public void set_http_version (Soup.HTTPVersion version);
public void set_request (string content_type, Soup.MemoryUse req_use, string req_body, ulong req_length);
@@ -413,7 +413,7 @@
[CCode (cheader_filename = "libsoup/soup.h")]
public class Server : GLib.Object {
public void add_auth_domain (Soup.AuthDomain auth_domain);
- public void add_handler (string path, Soup.ServerCallback callback, pointer user_data, GLib.DestroyNotify destroy);
+ public void add_handler (string path, Soup.ServerCallback callback, GLib.DestroyNotify destroy);
public weak GLib.MainContext get_async_context ();
public weak Soup.Socket get_listener ();
public uint get_port ();
@@ -452,7 +452,7 @@
public void pause_message (Soup.Message msg);
public void unpause_message (Soup.Message msg);
public virtual void cancel_message (Soup.Message msg, uint status_code);
- public virtual void queue_message (Soup.Message# msg, Soup.SessionCallback callback, pointer user_data);
+ public virtual void queue_message (Soup.Message# msg, Soup.SessionCallback callback);
public virtual void requeue_message (Soup.Message msg);
public virtual uint send_message (Soup.Message msg);
[NoAccessorMethod]
@@ -486,7 +486,7 @@
}
[CCode (cheader_filename = "libsoup/soup.h")]
public class Socket : GLib.Object {
- public void connect_async (GLib.Cancellable cancellable, Soup.SocketCallback callback, pointer user_data);
+ public void connect_async (GLib.Cancellable cancellable, Soup.SocketCallback callback);
public uint connect_sync (GLib.Cancellable cancellable);
public void disconnect ();
public weak Soup.Address get_local_address ();
@@ -520,17 +520,17 @@
public signal void writable ();
}
public static delegate void AddressCallback (Soup.Address addr, uint status, pointer data);
- public static delegate bool AuthDomainBasicAuthCallback (Soup.AuthDomain domain, Soup.Message msg, string username, string password, pointer user_data);
- public static delegate weak string AuthDomainDigestAuthCallback (Soup.AuthDomain domain, Soup.Message msg, string username, pointer user_data);
- public static delegate bool AuthDomainFilter (Soup.AuthDomain domain, Soup.Message msg, pointer user_data);
- public static delegate bool AuthDomainGenericAuthCallback (Soup.AuthDomain domain, Soup.Message msg, string username, pointer user_data);
- public static delegate weak Soup.Buffer ChunkAllocator (Soup.Message msg, ulong max_len, pointer user_data);
- public static delegate Soup.LoggerLogLevel LoggerFilter (Soup.Logger logger, Soup.Message msg, pointer user_data);
- public static delegate void LoggerPrinter (Soup.Logger logger, Soup.LoggerLogLevel level, string direction, string data, pointer user_data);
- public static delegate void MessageHeadersForeachFunc (string name, string value, pointer user_data);
- public static delegate void ServerCallback (Soup.Server server, Soup.Message msg, string path, GLib.HashTable query, Soup.ClientContext client, pointer user_data);
- public static delegate void SessionCallback (Soup.Session session, Soup.Message msg, pointer user_data);
- public static delegate void SocketCallback (Soup.Socket sock, uint status, pointer user_data);
+ public delegate bool AuthDomainBasicAuthCallback (Soup.AuthDomain domain, Soup.Message msg, string username, string password);
+ public delegate weak string AuthDomainDigestAuthCallback (Soup.AuthDomain domain, Soup.Message msg, string username);
+ public delegate bool AuthDomainFilter (Soup.AuthDomain domain, Soup.Message msg);
+ public delegate bool AuthDomainGenericAuthCallback (Soup.AuthDomain domain, Soup.Message msg, string username);
+ public delegate weak Soup.Buffer ChunkAllocator (Soup.Message msg, ulong max_len);
+ public delegate Soup.LoggerLogLevel LoggerFilter (Soup.Logger logger, Soup.Message msg);
+ public delegate void LoggerPrinter (Soup.Logger logger, Soup.LoggerLogLevel level, string direction, string data);
+ public delegate void MessageHeadersForeachFunc (string name, string value);
+ public delegate void ServerCallback (Soup.Server server, Soup.Message msg, string path, GLib.HashTable query, Soup.ClientContext client);
+ public delegate void SessionCallback (Soup.Session session, Soup.Message msg);
+ public delegate void SocketCallback (Soup.Socket sock, uint status);
public const int AF_INET6;
public const int ADDRESS_ANY_PORT;
public const string ADDRESS_FAMILY;
Modified: trunk/vapi/poppler-glib.vapi
==============================================================================
--- trunk/vapi/poppler-glib.vapi (original)
+++ trunk/vapi/poppler-glib.vapi Sat Feb 23 17:49:14 2008
@@ -295,7 +295,7 @@
public GLib.Time ctime;
public weak GLib.StringBuilder checksum;
public bool save (string filename) throws GLib.Error;
- public bool save_to_callback (Poppler.AttachmentSaveFunc save_func, pointer user_data) throws GLib.Error;
+ public bool save_to_callback (Poppler.AttachmentSaveFunc save_func) throws GLib.Error;
}
[CCode (cheader_filename = "poppler.h")]
public class Document : GLib.Object {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
