vala r1271 - in trunk: . vala vapi vapi/packages/gtk+-2.0 vapi/packages/libsoup-2.4 vapi/packages/pango vapigen
- From: juergbi svn gnome org
- To: svn-commits-list gnome org
- Subject: vala r1271 - in trunk: . vala vapi vapi/packages/gtk+-2.0 vapi/packages/libsoup-2.4 vapi/packages/pango vapigen
- Date: Sat, 19 Apr 2008 17:06:53 +0100 (BST)
Author: juergbi
Date: Sat Apr 19 16:06:52 2008
New Revision: 1271
URL: http://svn.gnome.org/viewvc/vala?rev=1271&view=rev
Log:
2008-04-19 Juerg Billeter <j bitron ch>
Replace `pointer' by `void*' in all bindings and remove pointer
struct from GLib bindings, fixes bug 510085
Modified:
trunk/ChangeLog
trunk/vala/valaparser.vala
trunk/vapi/atk.vapi
trunk/vapi/cairo.vapi
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/glib-2.0.vapi
trunk/vapi/gnet-2.0.vapi
trunk/vapi/gnome-desktop-2.0.vapi
trunk/vapi/gnome-keyring-1.vapi
trunk/vapi/gnome-vfs-2.0.vapi
trunk/vapi/goocanvas.vapi
trunk/vapi/gstreamer-0.10.vapi
trunk/vapi/gstreamer-audio-0.10.vapi
trunk/vapi/gstreamer-base-0.10.vapi
trunk/vapi/gstreamer-check-0.10.vapi
trunk/vapi/gstreamer-controller-0.10.vapi
trunk/vapi/gstreamer-dataprotocol-0.10.vapi
trunk/vapi/gstreamer-fft-0.10.vapi
trunk/vapi/gstreamer-interfaces-0.10.vapi
trunk/vapi/gstreamer-net-0.10.vapi
trunk/vapi/gstreamer-netbuffer-0.10.vapi
trunk/vapi/gstreamer-pbutils-0.10.vapi
trunk/vapi/gstreamer-rtp-0.10.vapi
trunk/vapi/gstreamer-rtsp-0.10.vapi
trunk/vapi/gstreamer-sdp-0.10.vapi
trunk/vapi/gstreamer-tag-0.10.vapi
trunk/vapi/gstreamer-video-0.10.vapi
trunk/vapi/gtk+-2.0.vapi
trunk/vapi/gtksourceview-2.0.vapi
trunk/vapi/hildon-1.vapi
trunk/vapi/json-glib-1.0.vapi
trunk/vapi/libgnome-2.0.vapi
trunk/vapi/libgnome-menu.vapi
trunk/vapi/libgnomeui-2.0.vapi
trunk/vapi/libnotify.vapi
trunk/vapi/liboobs-1.vapi
trunk/vapi/libsoup-2.2.vapi
trunk/vapi/libsoup-2.4.vapi
trunk/vapi/libwnck-1.0.vapi
trunk/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
trunk/vapi/packages/libsoup-2.4/libsoup-2.4.metadata
trunk/vapi/packages/pango/pango-custom.vala
trunk/vapi/pango.vapi
trunk/vapi/pangocairo.vapi
trunk/vapi/poppler-glib.vapi
trunk/vapi/vte.vapi
trunk/vapi/webkit-1.0.vapi
trunk/vapigen/valagidlparser.vala
Modified: trunk/vala/valaparser.vala
==============================================================================
--- trunk/vala/valaparser.vala (original)
+++ trunk/vala/valaparser.vala Sat Apr 19 16:06:52 2008
@@ -2118,7 +2118,8 @@
var access = parse_access_modifier ();
var flags = parse_member_declaration_modifiers ();
var type = parse_type ();
- if (!((UnresolvedType) type).is_weak) {
+ var ut = type as UnresolvedType;
+ if (ut != null && !ut.is_weak) {
type.takes_ownership = true;
}
string id = parse_identifier ();
@@ -2703,7 +2704,8 @@
case TokenType.WEAK:
case TokenType.IDENTIFIER:
var type = parse_type ();
- if (!((UnresolvedType) type).is_weak) {
+ var ut = type as UnresolvedType;
+ if (ut != null && !ut.is_weak) {
type.takes_ownership = true;
}
list.add (type);
Modified: trunk/vapi/atk.vapi
==============================================================================
--- trunk/vapi/atk.vapi (original)
+++ trunk/vapi/atk.vapi Sat Apr 19 16:06:52 2008
@@ -2,18 +2,18 @@
[CCode (cprefix = "Atk", lower_case_cprefix = "atk_")]
namespace Atk {
- [CCode (cprefix = "ATK_XY_", cheader_filename = "atk/atk.h")]
+ [CCode (cprefix = "ATK_XY_", has_type_id = "0", cheader_filename = "atk/atk.h")]
public enum CoordType {
SCREEN,
- WINDOW,
+ WINDOW
}
- [CCode (cprefix = "ATK_KEY_EVENT_", cheader_filename = "atk/atk.h")]
+ [CCode (cprefix = "ATK_KEY_EVENT_", has_type_id = "0", cheader_filename = "atk/atk.h")]
public enum KeyEventType {
PRESS,
RELEASE,
- LAST_DEFINED,
+ LAST_DEFINED
}
- [CCode (cprefix = "ATK_LAYER_", cheader_filename = "atk/atk.h")]
+ [CCode (cprefix = "ATK_LAYER_", has_type_id = "0", cheader_filename = "atk/atk.h")]
public enum Layer {
INVALID,
BACKGROUND,
@@ -22,9 +22,9 @@
MDI,
POPUP,
OVERLAY,
- WINDOW,
+ WINDOW
}
- [CCode (cprefix = "ATK_RELATION_", cheader_filename = "atk/atk.h")]
+ [CCode (cprefix = "ATK_RELATION_", has_type_id = "0", cheader_filename = "atk/atk.h")]
public enum RelationType {
NULL,
CONTROLLED_BY,
@@ -42,9 +42,9 @@
PARENT_WINDOW_OF,
DESCRIBED_BY,
DESCRIPTION_FOR,
- LAST_DEFINED,
+ LAST_DEFINED
}
- [CCode (cprefix = "ATK_ROLE_", cheader_filename = "atk/atk.h")]
+ [CCode (cprefix = "ATK_ROLE_", has_type_id = "0", cheader_filename = "atk/atk.h")]
public enum Role {
INVALID,
ACCEL_LABEL,
@@ -134,9 +134,9 @@
FORM,
LINK,
INPUT_METHOD_WINDOW,
- LAST_DEFINED,
+ LAST_DEFINED
}
- [CCode (cprefix = "ATK_STATE_", cheader_filename = "atk/atk.h")]
+ [CCode (cprefix = "ATK_STATE_", has_type_id = "0", cheader_filename = "atk/atk.h")]
public enum StateType {
INVALID,
ACTIVE,
@@ -177,9 +177,9 @@
DEFAULT,
ANIMATED,
VISITED,
- LAST_DEFINED,
+ LAST_DEFINED
}
- [CCode (cprefix = "ATK_TEXT_ATTR_", cheader_filename = "atk/atk.h")]
+ [CCode (cprefix = "ATK_TEXT_ATTR_", has_type_id = "0", cheader_filename = "atk/atk.h")]
public enum TextAttribute {
INVALID,
LEFT_MARGIN,
@@ -209,9 +209,9 @@
STRETCH,
VARIANT,
STYLE,
- LAST_DEFINED,
+ LAST_DEFINED
}
- [CCode (cprefix = "ATK_TEXT_BOUNDARY_", cheader_filename = "atk/atk.h")]
+ [CCode (cprefix = "ATK_TEXT_BOUNDARY_", has_type_id = "0", cheader_filename = "atk/atk.h")]
public enum TextBoundary {
CHAR,
WORD_START,
@@ -219,19 +219,19 @@
SENTENCE_START,
SENTENCE_END,
LINE_START,
- LINE_END,
+ LINE_END
}
- [CCode (cprefix = "ATK_TEXT_CLIP_", cheader_filename = "atk/atk.h")]
+ [CCode (cprefix = "ATK_TEXT_CLIP_", has_type_id = "0", cheader_filename = "atk/atk.h")]
public enum TextClipType {
NONE,
MIN,
MAX,
- BOTH,
+ BOTH
}
- [CCode (cprefix = "ATK_HYPERLINK_IS_", cheader_filename = "atk/atk.h")]
+ [CCode (cprefix = "ATK_HYPERLINK_IS_", has_type_id = "0", cheader_filename = "atk/atk.h")]
[Flags]
public enum HyperlinkStateFlags {
- INLINE,
+ INLINE
}
[CCode (cheader_filename = "atk/atk.h")]
public class Attribute {
@@ -247,6 +247,7 @@
public uint state;
public uint keyval;
public int length;
+ [CCode (cname = "string")]
public weak string str;
public ushort keycode;
public uint timestamp;
@@ -339,7 +340,7 @@
public virtual weak string get_name ();
public virtual weak Atk.Object get_parent ();
public virtual Atk.Role get_role ();
- public virtual void initialize (pointer data);
+ public virtual void initialize (void* data);
[NoWrapper]
public virtual weak Atk.Object ref_child (int i);
public virtual weak Atk.RelationSet ref_relation_set ();
@@ -379,10 +380,10 @@
public weak Atk.Object accessible_table_summary { get; set; }
[NoAccessorMethod]
public weak double accessible_value { get; set; }
- public signal void active_descendant_changed (pointer child);
- public signal void children_changed (uint change_index, pointer changed_child);
+ public signal void active_descendant_changed (void* child);
+ public signal void children_changed (uint change_index, void* changed_child);
public signal void focus_event (bool focus_in);
- public signal void property_change (pointer values);
+ public signal void property_change (void* values);
public signal void state_change (string name, bool state_set);
public signal void visible_data_changed ();
}
@@ -446,7 +447,7 @@
[NoWrapper]
public virtual uint add_global_event_listener (GLib.SignalEmissionHook listener, string event_type);
[NoWrapper]
- public virtual uint add_key_event_listener (Atk.KeySnoopFunc listener, pointer data);
+ public virtual uint add_key_event_listener (Atk.KeySnoopFunc listener, void* data);
[NoWrapper]
public virtual weak Atk.Object get_root ();
[NoWrapper]
@@ -492,7 +493,7 @@
public weak Atk.AttributeSet get_attributes ();
public weak string get_locale ();
public bool set_attribute_value (string attribute_name, string attribute_value);
- public abstract pointer get_document ();
+ public abstract void* get_document ();
[NoWrapper]
public abstract weak string get_document_attribute_value (string attribute_name);
[NoWrapper]
@@ -651,7 +652,7 @@
[CCode (cheader_filename = "atk/atk.h")]
public delegate bool Function ();
[CCode (cheader_filename = "atk/atk.h")]
- public static delegate int KeySnoopFunc (Atk.KeyEventStruct event, pointer func_data);
+ public static delegate int KeySnoopFunc (Atk.KeyEventStruct event, void* func_data);
[CCode (cheader_filename = "atk/atk.h")]
public static delegate void PropertyChangeHandler (Atk.Object p1, Atk.PropertyValues p2);
[CCode (cheader_filename = "atk/atk.h")]
@@ -659,7 +660,7 @@
[CCode (cheader_filename = "atk/atk.h")]
public static uint add_global_event_listener (GLib.SignalEmissionHook listener, string event_type);
[CCode (cheader_filename = "atk/atk.h")]
- public static uint add_key_event_listener (Atk.KeySnoopFunc listener, pointer data);
+ public static uint add_key_event_listener (Atk.KeySnoopFunc listener, void* data);
[CCode (cheader_filename = "atk/atk.h")]
public static void focus_tracker_init (Atk.EventListenerInit init);
[CCode (cheader_filename = "atk/atk.h")]
Modified: trunk/vapi/cairo.vapi
==============================================================================
--- trunk/vapi/cairo.vapi (original)
+++ trunk/vapi/cairo.vapi Sat Apr 19 16:06:52 2008
@@ -405,7 +405,7 @@
public SurfaceType get_type ();
public Status write_to_png (string filename);
- public Status write_to_png_stream (WriteFunc write_func, pointer closure);
+ public Status write_to_png_stream (WriteFunc write_func, void* closure);
}
public enum Content {
@@ -452,7 +452,7 @@
[CCode (cname = "cairo_image_surface_create_from_png")]
public ImageSurface.from_png (string filename);
[CCode (cname = "cairo_image_surface_create_from_png_stream")]
- public ImageSurface.from_png_stream (ReadFunc read_func, pointer closure);
+ public ImageSurface.from_png_stream (ReadFunc read_func, void* closure);
}
[CCode (cname = "cairo_surface_t", cheader_filename = "cairo-pdf.h")]
@@ -460,19 +460,19 @@
[CCode (cname = "cairo_pdf_surface_create")]
public PdfSurface (string filename, double width_in_points, double height_in_points);
[CCode (cname = "cairo_pdf_surface_create_for_stream")]
- public PdfSurface.for_stream (WriteFunc write_func, pointer closure, double width_in_points, double height_in_points);
+ public PdfSurface.for_stream (WriteFunc write_func, void* closure, double width_in_points, double height_in_points);
public void set_size (double width_in_points, double height_in_points);
}
- public static delegate Status ReadFunc (pointer closure, uchar[] data);
- public static delegate Status WriteFunc (pointer closure, uchar[] data);
+ public static delegate Status ReadFunc (void* closure, uchar[] data);
+ public static delegate Status WriteFunc (void* closure, uchar[] data);
[CCode (cname = "cairo_surface_t", cheader_filename = "cairo-ps.h")]
public class PsSurface : Surface {
[CCode (cname = "cairo_ps_surface_create")]
public PsSurface (string filename, double width_in_points, double height_in_points);
[CCode (cname = "cairo_ps_surface_create_for_stream")]
- public PsSurface.for_stream (WriteFunc write_func, pointer closure, double width_in_points, double height_in_points);
+ public PsSurface.for_stream (WriteFunc write_func, void* closure, double width_in_points, double height_in_points);
public void set_size (double width_in_points, double height_in_points);
public void dsc_begin_setup ();
public void dsc_begin_page_setup ();
@@ -484,7 +484,7 @@
[CCode (cname = "cairo_svg_surface_create")]
public SvgSurface (string filename, double width_in_points, double height_in_points);
[CCode (cname = "cairo_svg_surface_create_for_stream")]
- public SvgSurface.for_stream (WriteFunc write_func, pointer closure, double width_in_points, double height_in_points);
+ public SvgSurface.for_stream (WriteFunc write_func, void* closure, double width_in_points, double height_in_points);
public void restrict_to_version (SvgVersion version);
public static void get_versions (out SvgVersion[] versions);
}
@@ -498,15 +498,15 @@
[CCode (cname = "cairo_surface_t", cheader_filename = "cairo-xlib.h")]
public class XlibSurface : Surface {
[CCode (cname = "cairo_xlib_surface_create")]
- public XlibSurface (pointer dpy, int drawable, pointer visual, int width, int height);
+ public XlibSurface (void* dpy, int drawable, void* visual, int width, int height);
[CCode (cname = "cairo_xlib_surface_create_for_bitmap")]
- public XlibSurface.for_bitmap (pointer dpy, int bitmap, pointer screen, int width, int height);
+ public XlibSurface.for_bitmap (void* dpy, int bitmap, void* screen, int width, int height);
public void set_size (int width, int height);
- public pointer get_display ();
- public pointer get_screen ();
+ public void* get_display ();
+ public void* get_screen ();
public void set_drawable (int drawable, int width, int height);
public int get_drawable ();
- public pointer get_visual ();
+ public void* get_visual ();
public int get_width ();
public int get_height ();
public int get_depth ();
Modified: trunk/vapi/gconf-2.0.vapi
==============================================================================
--- trunk/vapi/gconf-2.0.vapi (original)
+++ trunk/vapi/gconf-2.0.vapi Sat Apr 19 16:06:52 2008
@@ -2,19 +2,19 @@
[CCode (cprefix = "GConf", lower_case_cprefix = "gconf_")]
namespace GConf {
- [CCode (cprefix = "GCONF_CLIENT_HANDLE_", cheader_filename = "gconf/gconf.h")]
+ [CCode (cprefix = "GCONF_CLIENT_HANDLE_", has_type_id = "0", cheader_filename = "gconf/gconf.h")]
public enum ClientErrorHandlingMode {
NONE,
UNRETURNED,
- ALL,
+ ALL
}
- [CCode (cprefix = "GCONF_CLIENT_PRELOAD_", cheader_filename = "gconf/gconf.h")]
+ [CCode (cprefix = "GCONF_CLIENT_PRELOAD_", has_type_id = "0", cheader_filename = "gconf/gconf.h")]
public enum ClientPreloadType {
NONE,
ONELEVEL,
- RECURSIVE,
+ RECURSIVE
}
- [CCode (cprefix = "GCONF_ERROR_", cheader_filename = "gconf/gconf.h")]
+ [CCode (cprefix = "GCONF_ERROR_", has_type_id = "0", cheader_filename = "gconf/gconf.h")]
public enum Error {
SUCCESS,
FAILED,
@@ -32,9 +32,9 @@
LOCAL_ENGINE,
LOCK_FAILED,
NO_WRITABLE_DATABASE,
- IN_SHUTDOWN,
+ IN_SHUTDOWN
}
- [CCode (cprefix = "GCONF_VALUE_", cheader_filename = "gconf/gconf.h")]
+ [CCode (cprefix = "GCONF_VALUE_", has_type_id = "0", cheader_filename = "gconf/gconf.h")]
public enum ValueType {
INVALID,
STRING,
@@ -43,12 +43,12 @@
BOOL,
SCHEMA,
LIST,
- PAIR,
+ PAIR
}
- [CCode (cprefix = "GCONF_UNSET_INCLUDING_SCHEMA_", cheader_filename = "gconf/gconf.h")]
+ [CCode (cprefix = "GCONF_UNSET_INCLUDING_SCHEMA_", has_type_id = "0", cheader_filename = "gconf/gconf.h")]
[Flags]
public enum UnsetFlags {
- NAMES,
+ NAMES
}
[CCode (ref_function = "gconf_engine_ref", unref_function = "gconf_engine_unref", cheader_filename = "gconf/gconf.h")]
public class Engine {
@@ -69,10 +69,10 @@
public static weak GConf.Engine get_for_addresses (GLib.SList addresses) throws GLib.Error;
public int get_int (string key) throws GLib.Error;
public weak GLib.SList get_list (string key, GConf.ValueType list_type) throws GLib.Error;
- public bool get_pair (string key, GConf.ValueType car_type, GConf.ValueType cdr_type, pointer car_retloc, pointer cdr_retloc) throws GLib.Error;
+ public bool get_pair (string key, GConf.ValueType car_type, GConf.ValueType cdr_type, void* car_retloc, void* cdr_retloc) throws GLib.Error;
public weak GConf.Schema get_schema (string key) throws GLib.Error;
public weak string get_string (string key) throws GLib.Error;
- public pointer get_user_data ();
+ public void* get_user_data ();
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;
@@ -85,10 +85,10 @@
public bool set_float (string key, double val) throws GLib.Error;
public bool set_int (string key, int val) throws GLib.Error;
public bool set_list (string key, GConf.ValueType list_type, GLib.SList list) throws GLib.Error;
- public bool set_pair (string key, GConf.ValueType car_type, GConf.ValueType cdr_type, pointer address_of_car, pointer address_of_cdr) throws GLib.Error;
+ public bool set_pair (string key, GConf.ValueType car_type, GConf.ValueType cdr_type, void* address_of_car, void* address_of_cdr) throws GLib.Error;
public bool set_schema (string key, GConf.Schema val) throws GLib.Error;
public bool set_string (string key, string val) throws GLib.Error;
- public void set_user_data (pointer data, GLib.DestroyNotify dnotify);
+ public void set_user_data (void* data, GLib.DestroyNotify dnotify);
public void suggest_sync () throws GLib.Error;
public bool unset (string key) throws GLib.Error;
}
@@ -119,10 +119,10 @@
}
[CCode (cheader_filename = "gconf/gconf.h")]
public class Listeners {
- public uint add (string listen_point, pointer listener_data, GLib.FreeFunc destroy_notify);
+ public uint add (string listen_point, void* listener_data, GLib.FreeFunc destroy_notify);
public uint count ();
public void @foreach (GConf.ListenersForeach callback);
- public bool get_data (uint cnxn_id, pointer listener_data_p, string location_p);
+ public bool get_data (uint cnxn_id, void* listener_data_p, string location_p);
public Listeners ();
public void notify (string all_above, GConf.ListenersCallback callback);
public void remove (uint cnxn_id);
@@ -201,7 +201,7 @@
public bool check_value (string key, out weak GConf.Value value_retloc);
public void clear ();
public void @foreach (GConf.ChangeSetForeachFunc func);
- public pointer get_user_data ();
+ public void* get_user_data ();
public ChangeSet ();
public void remove (string key);
public void set (string key, GConf.Value value);
@@ -210,10 +210,10 @@
public void set_int (string key, int val);
public void set_list (string key, GConf.ValueType list_type, GLib.SList list);
public void set_nocopy (string key, GConf.Value value);
- public void set_pair (string key, GConf.ValueType car_type, GConf.ValueType cdr_type, pointer address_of_car, pointer address_of_cdr);
+ public void set_pair (string key, GConf.ValueType car_type, GConf.ValueType cdr_type, void* address_of_car, void* address_of_cdr);
public void set_schema (string key, GConf.Schema val);
public void set_string (string key, string val);
- public void set_user_data (pointer data, GLib.DestroyNotify dnotify);
+ public void set_user_data (void* data, GLib.DestroyNotify dnotify);
public uint size ();
public void unset (string key);
}
@@ -227,7 +227,7 @@
public weak GLib.SList notify_list;
public uint notify_handler;
public int pending_notify_count;
- public pointer pad1;
+ public void* pad1;
public int pad2;
public void add_dir (string dir, GConf.ClientPreloadType preload) throws GLib.Error;
public weak GLib.SList all_dirs (string dir) throws GLib.Error;
@@ -246,7 +246,7 @@
public static weak GConf.Client get_for_engine (GConf.Engine engine);
public int get_int (string key) throws GLib.Error;
public weak GLib.SList get_list (string key, GConf.ValueType list_type) throws GLib.Error;
- public bool get_pair (string key, GConf.ValueType car_type, GConf.ValueType cdr_type, pointer car_retloc, pointer cdr_retloc) throws GLib.Error;
+ public bool get_pair (string key, GConf.ValueType car_type, GConf.ValueType cdr_type, void* car_retloc, void* cdr_retloc) throws GLib.Error;
public weak GConf.Schema get_schema (string key) throws GLib.Error;
public weak string get_string (string key) throws GLib.Error;
public weak GConf.Value get_without_default (string key) throws GLib.Error;
@@ -265,17 +265,17 @@
public static void set_global_default_error_handler (GConf.ClientErrorHandlerFunc func);
public bool set_int (string key, int val) throws GLib.Error;
public bool set_list (string key, GConf.ValueType list_type, GLib.SList list) throws GLib.Error;
- public bool set_pair (string key, GConf.ValueType car_type, GConf.ValueType cdr_type, pointer address_of_car, pointer address_of_cdr) throws GLib.Error;
+ public bool set_pair (string key, GConf.ValueType car_type, GConf.ValueType cdr_type, void* address_of_car, void* address_of_cdr) throws GLib.Error;
public bool set_schema (string key, GConf.Schema val) throws GLib.Error;
public bool set_string (string key, string val) throws GLib.Error;
public void suggest_sync () throws GLib.Error;
public bool unset (string key) throws GLib.Error;
[HasEmitter]
- public signal void error (pointer error);
+ public signal void error (void* error);
[HasEmitter]
- public signal void unreturned_error (pointer error);
+ public signal void unreturned_error (void* error);
[HasEmitter]
- public signal void value_changed (string key, pointer value);
+ public signal void value_changed (string key, void* value);
}
[CCode (cheader_filename = "gconf/gconf.h")]
public delegate void ChangeSetForeachFunc (GConf.ChangeSet cs, string key, GConf.Value value);
@@ -284,11 +284,11 @@
[CCode (cheader_filename = "gconf/gconf.h")]
public delegate void ClientNotifyFunc (GConf.Client client, uint cnxn_id, GConf.Entry entry);
[CCode (cheader_filename = "gconf/gconf.h")]
- public delegate void ListenersCallback (GConf.Listeners listeners, string all_above_key, uint cnxn_id, pointer listener_data);
+ public delegate void ListenersCallback (GConf.Listeners listeners, string all_above_key, uint cnxn_id, void* listener_data);
[CCode (cheader_filename = "gconf/gconf.h")]
- public delegate void ListenersForeach (string location, uint cnxn_id, pointer listener_data);
+ public delegate void ListenersForeach (string location, uint cnxn_id, void* listener_data);
[CCode (cheader_filename = "gconf/gconf.h")]
- public delegate bool ListenersPredicate (string location, uint cnxn_id, pointer listener_data);
+ public delegate bool ListenersPredicate (string location, uint cnxn_id, void* listener_data);
[CCode (cheader_filename = "gconf/gconf.h")]
public delegate void NotifyFunc (GConf.Engine conf, uint cnxn_id, GConf.Entry entry);
[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 Apr 19 16:06:52 2008
@@ -582,7 +582,7 @@
public char send_event;
public Gdk.Atom message_type;
public ushort data_format;
- public pointer data;
+ public void* data;
}
[CCode (cheader_filename = "gdk/gdk.h")]
public class EventConfigure {
@@ -847,7 +847,7 @@
public Gdk.OverlapType rect_in (Gdk.Rectangle rectangle);
public static weak Gdk.Region rectangle (Gdk.Rectangle rectangle);
public void shrink (int dx, int dy);
- public void spans_intersect_foreach (Gdk.Span[] spans, bool sorted, Gdk.SpanFunc function, pointer data);
+ public void spans_intersect_foreach (Gdk.Span[] spans, bool sorted, Gdk.SpanFunc function, void* data);
public void subtract (Gdk.Region source2);
public void union (Gdk.Region source2);
public void union_with_rect (Gdk.Rectangle rect);
@@ -942,7 +942,7 @@
public weak Gdk.Screen get_screen ();
public bool get_state (Gdk.ModifierType state);
public uint get_time ();
- public static void handler_set (Gdk.EventFunc func, pointer data, GLib.DestroyNotify notify);
+ public static void handler_set (Gdk.EventFunc func, void* data, GLib.DestroyNotify notify);
public Event (Gdk.EventType type);
public static weak Gdk.Event peek ();
public void put ();
@@ -957,7 +957,7 @@
public int size;
public Gdk.Color colors;
public weak Gdk.Visual visual;
- public pointer windowing_data;
+ public void* windowing_data;
public bool alloc_color (Gdk.Color color, bool writeable, bool best_match);
public int alloc_colors (Gdk.Color[] colors, int ncolors, bool writeable, bool best_match, bool success);
public void free_colors (Gdk.Color[] colors, int ncolors);
@@ -1005,7 +1005,7 @@
public int[] button_x;
[NoArrayLength]
public int[] button_y;
- public void add_client_message_filter (Gdk.Atom message_type, Gdk.FilterFunc func, pointer data);
+ public void add_client_message_filter (Gdk.Atom message_type, Gdk.FilterFunc func, void* data);
public void beep ();
public void close ();
public void flush ();
@@ -1067,7 +1067,7 @@
public Gdk.DragAction suggested_action;
public Gdk.DragAction action;
public uint start_time;
- public pointer windowing_data;
+ public void* windowing_data;
public DragContext ();
}
[CCode (cheader_filename = "gdk/gdk.h")]
@@ -1163,9 +1163,9 @@
public ushort bpp;
public ushort bpl;
public ushort bits_per_pixel;
- public pointer mem;
+ public void* mem;
public weak Gdk.Colormap colormap;
- public pointer windowing_data;
+ public void* windowing_data;
public weak Gdk.Colormap get_colormap ();
public uint get_pixel (int x, int y);
public Image (Gdk.ImageType type, Gdk.Visual visual, int width, int height);
@@ -1254,7 +1254,7 @@
public void set_resolution (double dpi);
public static int width ();
public static int width_mm ();
- public weak pointer font_options { get; set; }
+ public weak void* font_options { get; set; }
public weak double resolution { get; set; }
public signal void composited_changed ();
public signal void size_changed ();
@@ -1286,7 +1286,7 @@
}
[CCode (cheader_filename = "gdk/gdk.h")]
public class Window : Gdk.Drawable {
- public void add_filter (Gdk.FilterFunc function, pointer data);
+ public void add_filter (Gdk.FilterFunc function, void* data);
public static weak Gdk.Window at_pointer (int win_x, int win_y);
public void beep ();
public void begin_move_drag (int button, int root_x, int root_y, uint timestamp);
@@ -1326,7 +1326,7 @@
public static weak GLib.List get_toplevels ();
public Gdk.WindowTypeHint get_type_hint ();
public weak Gdk.Region get_update_area ();
- public void get_user_data (pointer data);
+ public void get_user_data (void* data);
public Gdk.WindowType get_window_type ();
public void hide ();
public void iconify ();
@@ -1352,7 +1352,7 @@
public void process_updates (bool update_children);
public void raise ();
public void register_dnd ();
- public void remove_filter (Gdk.FilterFunc function, pointer data);
+ public void remove_filter (Gdk.FilterFunc function, void* data);
public void reparent (Gdk.Window new_parent, int x, int y);
public void resize (int width, int height);
public void scroll (int dx, int dy);
@@ -1387,7 +1387,7 @@
public void set_transient_for (Gdk.Window parent);
public void set_type_hint (Gdk.WindowTypeHint hint);
public void set_urgency_hint (bool urgent);
- public void set_user_data (pointer user_data);
+ public void set_user_data (void* user_data);
public void shape_combine_mask (Gdk.Bitmap mask, int x, int y);
public void shape_combine_region (Gdk.Region shape_region, int offset_x, int offset_y);
public void show ();
@@ -1454,7 +1454,7 @@
[CCode (cheader_filename = "gdk/gdk.h")]
public delegate Gdk.FilterReturn FilterFunc (Gdk.XEvent xevent, Gdk.Event event);
[CCode (cheader_filename = "gdk/gdk.h")]
- public static delegate void InputFunction (pointer data, int source, Gdk.InputCondition condition);
+ public static delegate void InputFunction (void* data, int source, Gdk.InputCondition condition);
[CCode (cheader_filename = "gdk/gdk.h")]
public delegate void SpanFunc (Gdk.Span span);
public const Gdk.Atom SELECTION_PRIMARY;
@@ -1465,7 +1465,7 @@
public const int PARENT_RELATIVE;
public const int PRIORITY_REDRAW;
[CCode (cheader_filename = "gdk/gdk.h")]
- public static void add_client_message_filter (Gdk.Atom message_type, Gdk.FilterFunc func, pointer data);
+ public static void add_client_message_filter (Gdk.Atom message_type, Gdk.FilterFunc func, void* data);
[CCode (cheader_filename = "gdk/gdk.h")]
public static void add_option_entries_libgtk_only (GLib.OptionGroup group);
[CCode (cheader_filename = "gdk/gdk.h")]
@@ -1721,13 +1721,13 @@
[CCode (cheader_filename = "gdk/gdk.h")]
public static int text_property_to_utf8_list_for_display (Gdk.Display display, Gdk.Atom encoding, int format, uchar[] text, int length, string list);
[CCode (cheader_filename = "gdk/gdk.h")]
- public static uint threads_add_idle (GLib.SourceFunc function, pointer data);
+ public static uint threads_add_idle (GLib.SourceFunc function, void* data);
[CCode (cheader_filename = "gdk/gdk.h")]
- public static uint threads_add_idle_full (int priority, GLib.SourceFunc function, pointer data, GLib.DestroyNotify notify);
+ public static uint threads_add_idle_full (int priority, GLib.SourceFunc function, void* data, GLib.DestroyNotify notify);
[CCode (cheader_filename = "gdk/gdk.h")]
- public static uint threads_add_timeout (uint interval, GLib.SourceFunc function, pointer data);
+ public static uint threads_add_timeout (uint interval, GLib.SourceFunc function, void* data);
[CCode (cheader_filename = "gdk/gdk.h")]
- public static uint threads_add_timeout_full (int priority, uint interval, GLib.SourceFunc function, pointer data, GLib.DestroyNotify notify);
+ public static uint threads_add_timeout_full (int priority, uint interval, GLib.SourceFunc function, void* data, GLib.DestroyNotify notify);
[CCode (cheader_filename = "gdk/gdk.h")]
public static void threads_enter ();
[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 Apr 19 16:06:52 2008
@@ -2,39 +2,39 @@
[CCode (cprefix = "Gdk", lower_case_cprefix = "gdk_")]
namespace Gdk {
- [CCode (cprefix = "GDK_COLORSPACE_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+ [CCode (cprefix = "GDK_COLORSPACE_", has_type_id = "0", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
public enum Colorspace {
- RGB,
+ RGB
}
- [CCode (cprefix = "GDK_INTERP_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+ [CCode (cprefix = "GDK_INTERP_", has_type_id = "0", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
public enum InterpType {
NEAREST,
TILES,
BILINEAR,
- HYPER,
+ HYPER
}
- [CCode (cprefix = "GDK_PIXBUF_ALPHA_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+ [CCode (cprefix = "GDK_PIXBUF_ALPHA_", has_type_id = "0", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
public enum PixbufAlphaMode {
BILEVEL,
- FULL,
+ FULL
}
- [CCode (cprefix = "GDK_PIXBUF_ERROR_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+ [CCode (cprefix = "GDK_PIXBUF_ERROR_", has_type_id = "0", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
public enum PixbufError {
CORRUPT_IMAGE,
INSUFFICIENT_MEMORY,
BAD_OPTION,
UNKNOWN_TYPE,
UNSUPPORTED_OPERATION,
- FAILED,
+ FAILED
}
- [CCode (cprefix = "GDK_PIXBUF_ROTATE_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+ [CCode (cprefix = "GDK_PIXBUF_ROTATE_", has_type_id = "0", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
public enum PixbufRotation {
NONE,
COUNTERCLOCKWISE,
UPSIDEDOWN,
- CLOCKWISE,
+ CLOCKWISE
}
- [CCode (cprefix = "GDK_PIXDATA_DUMP_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+ [CCode (cprefix = "GDK_PIXDATA_DUMP_", has_type_id = "0", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
public enum PixdataDumpType {
PIXDATA_STREAM,
PIXDATA_STRUCT,
@@ -43,9 +43,9 @@
CTYPES,
STATIC,
CONST,
- RLE_DECODER,
+ RLE_DECODER
}
- [CCode (cprefix = "GDK_PIXDATA_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+ [CCode (cprefix = "GDK_PIXDATA_", has_type_id = "0", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
public enum PixdataType {
COLOR_TYPE_RGB,
COLOR_TYPE_RGBA,
@@ -54,7 +54,7 @@
SAMPLE_WIDTH_MASK,
ENCODING_RAW,
ENCODING_RLE,
- ENCODING_MASK,
+ ENCODING_MASK
}
[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
public class PixbufFormat {
@@ -96,7 +96,7 @@
public int get_rowstride ();
public int get_width ();
public Pixbuf (Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height);
- public Pixbuf.from_data (uchar[] data, Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height, int rowstride, Gdk.PixbufDestroyNotify destroy_fn, pointer destroy_fn_data);
+ public Pixbuf.from_data (uchar[] data, Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height, int rowstride, Gdk.PixbufDestroyNotify destroy_fn, void* destroy_fn_data);
public Pixbuf.from_file (string filename) throws GLib.Error;
public Pixbuf.from_file_at_scale (string filename, int width, int height, bool preserve_aspect_ratio) throws GLib.Error;
public Pixbuf.from_file_at_size (string filename, int width, int height) throws GLib.Error;
@@ -124,7 +124,7 @@
[NoAccessorMethod]
public weak int n_channels { get; construct; }
[NoAccessorMethod]
- public weak pointer pixels { get; construct; }
+ public weak void* pixels { get; construct; }
[NoAccessorMethod]
public weak int rowstride { get; construct; }
[NoAccessorMethod]
@@ -181,7 +181,7 @@
[NoArrayLength]
public uchar[] pixel_data;
public bool deserialize ([CCode (array_length_pos = 0.9)] uchar[] stream) throws GLib.Error;
- public pointer from_pixbuf (Gdk.Pixbuf pixbuf, bool use_rle);
+ public void* from_pixbuf (Gdk.Pixbuf pixbuf, bool use_rle);
public weak uchar[] serialize ();
public weak GLib.StringBuilder to_csource (string name, Gdk.PixdataDumpType dump_type);
}
Modified: trunk/vapi/gio-2.0.vapi
==============================================================================
--- trunk/vapi/gio-2.0.vapi (original)
+++ trunk/vapi/gio-2.0.vapi Sat Apr 19 16:06:52 2008
@@ -245,8 +245,8 @@
public ulong get_buffer_size ();
public BufferedInputStream (GLib.InputStream base_stream);
public BufferedInputStream.sized (GLib.InputStream base_stream, ulong size);
- public ulong peek (pointer buffer, ulong offset, ulong count);
- public pointer peek_buffer (ulong count);
+ public ulong peek (void* buffer, ulong offset, ulong count);
+ public void* peek_buffer (ulong count);
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;
@@ -339,7 +339,7 @@
public weak string get_attribute_as_string (string attribute);
public bool get_attribute_boolean (string attribute);
public weak string get_attribute_byte_string (string attribute);
- public bool get_attribute_data (string attribute, GLib.FileAttributeType type, pointer value_pp, GLib.FileAttributeStatus status);
+ public bool get_attribute_data (string attribute, GLib.FileAttributeType type, void* value_pp, GLib.FileAttributeStatus status);
public int get_attribute_int32 (string attribute);
public int64 get_attribute_int64 (string attribute);
public weak GLib.Object get_attribute_object (string attribute);
@@ -366,7 +366,7 @@
public weak string list_attributes (string name_space);
public FileInfo ();
public void remove_attribute (string attribute);
- public void set_attribute (string attribute, GLib.FileAttributeType type, pointer value_p);
+ public void set_attribute (string attribute, GLib.FileAttributeType type, void* value_p);
public void set_attribute_boolean (string attribute, bool attr_value);
public void set_attribute_byte_string (string attribute, string attr_value);
public void set_attribute_int32 (string attribute, int attr_value);
@@ -465,32 +465,32 @@
public bool close (GLib.Cancellable cancellable) throws GLib.Error;
public bool has_pending ();
public bool is_closed ();
- 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 long read (void* buffer, ulong count, GLib.Cancellable cancellable) throws GLib.Error;
+ public bool read_all (void* 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);
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);
+ public virtual void read_async (void* 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 read_fn (void* 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);
public virtual long skip_finish (GLib.AsyncResult _result) throws GLib.Error;
}
[CCode (cheader_filename = "gio/gio.h")]
public class MemoryInputStream : GLib.InputStream, GLib.Seekable {
- public void add_data (pointer data, long len, GLib.DestroyNotify destroy);
+ public void add_data (void* data, long len, GLib.DestroyNotify destroy);
public MemoryInputStream ();
- public MemoryInputStream.from_data (pointer data, long len, GLib.DestroyNotify destroy);
+ public MemoryInputStream.from_data (void* data, long len, GLib.DestroyNotify destroy);
}
[CCode (cheader_filename = "gio/gio.h")]
public class MemoryOutputStream : GLib.OutputStream, GLib.Seekable {
- public pointer get_data ();
+ public void* get_data ();
public ulong get_size ();
- public MemoryOutputStream (pointer data, ulong len, GLib.ReallocFunc realloc_fn, GLib.DestroyNotify destroy);
+ public MemoryOutputStream (void* data, ulong len, GLib.ReallocFunc realloc_fn, GLib.DestroyNotify destroy);
}
[CCode (cheader_filename = "gio/gio.h")]
public class MountOperation : GLib.Object {
@@ -530,8 +530,8 @@
public bool has_pending ();
public bool is_closed ();
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, out ulong bytes_written, GLib.Cancellable cancellable) throws GLib.Error;
+ public long write (void* buffer, ulong count, GLib.Cancellable cancellable) throws GLib.Error;
+ public bool write_all (void* buffer, ulong count, out ulong bytes_written, GLib.Cancellable cancellable) throws GLib.Error;
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]
@@ -542,30 +542,30 @@
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);
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);
+ public virtual void write_async (void* 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;
+ public virtual long write_fn (void* buffer, ulong count, GLib.Cancellable cancellable) throws GLib.Error;
}
[CCode (cheader_filename = "gio/gio.h")]
public class SimpleAsyncResult : GLib.Object, GLib.AsyncResult {
public void complete ();
public void complete_in_idle ();
public bool get_op_res_gboolean ();
- public pointer get_op_res_gpointer ();
+ public void* 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 source_tag);
+ public void* get_source_tag ();
+ public SimpleAsyncResult (GLib.Object source_object, GLib.AsyncReadyCallback callback, void* 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);
- public void set_error_va (GLib.Quark domain, int code, string format, pointer args);
+ public void set_error_va (GLib.Quark domain, int code, string format, void* args);
public void set_from_error (GLib.Error error);
public void set_handle_cancellation (bool handle_cancellation);
public void set_op_res_gboolean (bool op_res);
- public void set_op_res_gpointer (pointer op_res, GLib.DestroyNotify destroy_op_res);
+ public void set_op_res_gpointer (void* op_res, GLib.DestroyNotify destroy_op_res);
public void set_op_res_gssize (long op_res);
}
[CCode (cheader_filename = "gio/gio.h")]
@@ -643,7 +643,7 @@
[CCode (cheader_filename = "gio/gio.h")]
public interface AsyncResult : GLib.Object {
public abstract weak GLib.Object get_source_object ();
- public abstract pointer get_user_data ();
+ public abstract void* get_user_data ();
}
[CCode (cheader_filename = "gio/gio.h")]
public interface Drive : GLib.Object {
@@ -723,7 +723,7 @@
public abstract weak string get_uri ();
public abstract weak string get_uri_scheme ();
public abstract bool has_uri_scheme (string uri_scheme);
- public abstract uint hash (pointer file);
+ public abstract uint hash (void* file);
public abstract bool is_native ();
public abstract bool make_directory (GLib.Cancellable cancellable) throws GLib.Error;
public abstract bool make_symbolic_link (string symlink_value, GLib.Cancellable cancellable) throws GLib.Error;
@@ -754,7 +754,7 @@
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 bool set_attribute (string attribute, GLib.FileAttributeType type, void* 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);
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;
@@ -768,7 +768,7 @@
[CCode (cheader_filename = "gio/gio.h")]
public interface Icon : GLib.Object {
public abstract bool equal (GLib.Icon icon2);
- public abstract uint hash (pointer icon);
+ public abstract uint hash (void* icon);
}
[CCode (cheader_filename = "gio/gio.h")]
public interface LoadableIcon : GLib.Icon, GLib.Object {
@@ -831,11 +831,11 @@
[CCode (cheader_filename = "gio/gio.h")]
public delegate void FileProgressCallback (int64 current_num_bytes, int64 total_num_bytes);
[CCode (cheader_filename = "gio/gio.h")]
- public static delegate bool FileReadMoreCallback (string file_contents, int64 file_size, pointer callback_data);
+ public static delegate bool FileReadMoreCallback (string file_contents, int64 file_size, void* callback_data);
[CCode (cheader_filename = "gio/gio.h")]
public delegate bool IOSchedulerJobFunc (GLib.IOSchedulerJob job, GLib.Cancellable cancellable);
[CCode (cheader_filename = "gio/gio.h")]
- public static delegate pointer ReallocFunc (pointer data, ulong size);
+ public static delegate void* ReallocFunc (void* data, ulong size);
[CCode (cheader_filename = "gio/gio.h")]
public static delegate void SimpleAsyncThreadFunc (GLib.SimpleAsyncResult res, GLib.Object object, GLib.Cancellable cancellable);
public const string FILE_ATTRIBUTE_ACCESS_CAN_DELETE;
Modified: trunk/vapi/glib-2.0.vapi
==============================================================================
--- trunk/vapi/glib-2.0.vapi (original)
+++ trunk/vapi/glib-2.0.vapi Sat Apr 19 16:06:52 2008
@@ -29,18 +29,6 @@
}
[SimpleType]
-[CCode (cname = "gpointer", cheader_filename = "glib.h", type_id = "G_TYPE_POINTER", marshaller_type_name = "POINTER", get_value_function = "g_value_get_pointer", set_value_function = "g_value_set_pointer", default_value = "NULL")]
-[PointerType]
-public struct pointer {
- [CCode (cname = "GPOINTER_TO_INT")]
- public int to_int ();
- [CCode (cname = "GPOINTER_TO_UINT")]
- public uint to_uint ();
- [CCode (cname = "GPOINTER_TO_SIZE")]
- public size_t to_size ();
-}
-
-[SimpleType]
[CCode (cname = "gconstpointer", cheader_filename = "glib.h", type_id = "G_TYPE_POINTER", marshaller_type_name = "POINTER", get_value_function = "g_value_get_pointer", set_value_function = "g_value_set_pointer", default_value = "NULL")]
public struct constpointer {
}
Modified: trunk/vapi/gnet-2.0.vapi
==============================================================================
--- trunk/vapi/gnet-2.0.vapi (original)
+++ trunk/vapi/gnet-2.0.vapi Sat Apr 19 16:06:52 2008
@@ -7,9 +7,9 @@
NONE,
AGAIN,
INVAL,
- UNKNOWN,
+ UNKNOWN
}
- [CCode (cprefix = "GNET_CONN_", cheader_filename = "gnet.h")]
+ [CCode (cprefix = "GNET_CONN_", has_type_id = "0", cheader_filename = "gnet.h")]
public enum ConnEventType {
ERROR,
CONNECT,
@@ -18,15 +18,15 @@
READ,
WRITE,
READABLE,
- WRITABLE,
+ WRITABLE
}
- [CCode (cprefix = "GNET_CONN_HTTP_ERROR_", cheader_filename = "gnet.h")]
+ [CCode (cprefix = "GNET_CONN_HTTP_ERROR_", has_type_id = "0", cheader_filename = "gnet.h")]
public enum ConnHttpError {
UNSPECIFIED,
PROTOCOL_UNSUPPORTED,
- HOSTNAME_RESOLUTION,
+ HOSTNAME_RESOLUTION
}
- [CCode (cprefix = "GNET_CONN_HTTP_", cheader_filename = "gnet.h")]
+ [CCode (cprefix = "GNET_CONN_HTTP_", has_type_id = "0", cheader_filename = "gnet.h")]
public enum ConnHttpEventType {
RESOLVED,
CONNECTED,
@@ -35,37 +35,37 @@
DATA_PARTIAL,
DATA_COMPLETE,
TIMEOUT,
- ERROR,
+ ERROR
}
- [CCode (cprefix = "GNET_CONN_HTTP_FLAG_SKIP_HEADER_", cheader_filename = "gnet.h")]
+ [CCode (cprefix = "GNET_CONN_HTTP_FLAG_SKIP_HEADER_", has_type_id = "0", cheader_filename = "gnet.h")]
public enum ConnHttpHeaderFlags {
- CHECK,
+ CHECK
}
- [CCode (cprefix = "GNET_CONN_HTTP_METHOD_", cheader_filename = "gnet.h")]
+ [CCode (cprefix = "GNET_CONN_HTTP_METHOD_", has_type_id = "0", cheader_filename = "gnet.h")]
public enum ConnHttpMethod {
GET,
- POST,
+ POST
}
- [CCode (cprefix = "GIPV6_POLICY_", cheader_filename = "gnet.h")]
+ [CCode (cprefix = "GIPV6_POLICY_", has_type_id = "0", cheader_filename = "gnet.h")]
public enum IPv6Policy {
IPV4_THEN_IPV6,
IPV6_THEN_IPV4,
IPV4_ONLY,
- IPV6_ONLY,
+ IPV6_ONLY
}
- [CCode (cprefix = "GNET_TOS_", cheader_filename = "gnet.h")]
+ [CCode (cprefix = "GNET_TOS_", has_type_id = "0", cheader_filename = "gnet.h")]
public enum TOS {
NONE,
LOWDELAY,
THROUGHPUT,
RELIABILITY,
- LOWCOST,
+ LOWCOST
}
- [CCode (cprefix = "GTCP_SOCKET_CONNECT_ASYNC_STATUS_", cheader_filename = "gnet.h")]
+ [CCode (cprefix = "GTCP_SOCKET_CONNECT_ASYNC_STATUS_", has_type_id = "0", cheader_filename = "gnet.h")]
public enum TcpSocketConnectAsyncStatus {
OK,
INETADDR_ERROR,
- TCP_ERROR,
+ TCP_ERROR
}
[CCode (cheader_filename = "gnet.h")]
public class Conn {
@@ -92,7 +92,7 @@
public uint watch;
public uint timer;
public GNet.ConnFunc func;
- public pointer user_data;
+ public void* user_data;
public weak GLib.MainContext context;
public int priority;
}
@@ -109,8 +109,7 @@
public class ConnHttpEvent {
public GNet.ConnHttpEventType type;
public ulong stsize;
- [NoArrayLength]
- public weak pointer[] padding;
+ public void* padding;
}
[CCode (cheader_filename = "gnet.h")]
public class ConnHttpEventData {
@@ -119,16 +118,14 @@
public uint64 data_received;
public weak string buffer;
public ulong buffer_length;
- [NoArrayLength]
- public weak pointer[] padding;
+ public void* padding;
}
[CCode (cheader_filename = "gnet.h")]
public class ConnHttpEventError {
public weak GNet.ConnHttpEvent parent;
public GNet.ConnHttpError code;
public weak string message;
- [NoArrayLength]
- public weak pointer[] padding;
+ public void* padding;
}
[CCode (cheader_filename = "gnet.h")]
public class ConnHttpEventRedirect {
@@ -137,15 +134,13 @@
public uint max_redirects;
public weak string new_location;
public bool auto_redirect;
- [NoArrayLength]
- public weak pointer[] padding;
+ public void* padding;
}
[CCode (cheader_filename = "gnet.h")]
public class ConnHttpEventResolved {
public weak GNet.ConnHttpEvent parent;
public weak GNet.InetAddr ia;
- [NoArrayLength]
- public weak pointer[] padding;
+ public void* padding;
}
[CCode (cheader_filename = "gnet.h")]
public class ConnHttpEventResponse {
@@ -153,8 +148,7 @@
public uint response_code;
public weak string header_fields;
public weak string header_values;
- [NoArrayLength]
- public weak pointer[] padding;
+ public void* padding;
}
[CCode (cheader_filename = "gnet.h")]
public class InetAddr {
@@ -184,7 +178,7 @@
public weak GNet.TcpSocket socket;
public uint ref_count;
public GNet.ServerFunc func;
- public pointer user_data;
+ public void* user_data;
}
[CCode (cheader_filename = "gnet.h")]
public class TcpSocket {
@@ -322,7 +316,7 @@
[CCode (cheader_filename = "gnet.h")]
public static void inetaddr_delete_list (GLib.List list);
[CCode (cheader_filename = "gnet.h")]
- public static bool inetaddr_equal (pointer p1, pointer p2);
+ public static bool inetaddr_equal (void* p1, void* p2);
[CCode (cheader_filename = "gnet.h")]
public static void inetaddr_get_bytes (GNet.InetAddr inetaddr, string buffer);
[CCode (cheader_filename = "gnet.h")]
@@ -340,17 +334,17 @@
[CCode (cheader_filename = "gnet.h")]
public static weak string inetaddr_get_name (GNet.InetAddr inetaddr);
[CCode (cheader_filename = "gnet.h")]
- public static weak GNet.InetAddrGetNameAsyncID inetaddr_get_name_async (GNet.InetAddr inetaddr, GNet.InetAddrGetNameAsyncFunc func, pointer data);
+ public static weak GNet.InetAddrGetNameAsyncID inetaddr_get_name_async (GNet.InetAddr inetaddr, GNet.InetAddrGetNameAsyncFunc func, void* data);
[CCode (cheader_filename = "gnet.h")]
public static void inetaddr_get_name_async_cancel (GNet.InetAddrGetNameAsyncID id);
[CCode (cheader_filename = "gnet.h")]
- public static weak GNet.InetAddrGetNameAsyncID inetaddr_get_name_async_full (GNet.InetAddr inetaddr, GNet.InetAddrGetNameAsyncFunc func, pointer data, GLib.DestroyNotify notify, GLib.MainContext context, int priority);
+ public static weak GNet.InetAddrGetNameAsyncID inetaddr_get_name_async_full (GNet.InetAddr inetaddr, GNet.InetAddrGetNameAsyncFunc func, void* data, GLib.DestroyNotify notify, GLib.MainContext context, int priority);
[CCode (cheader_filename = "gnet.h")]
public static weak string inetaddr_get_name_nonblock (GNet.InetAddr inetaddr);
[CCode (cheader_filename = "gnet.h")]
public static int inetaddr_get_port (GNet.InetAddr inetaddr);
[CCode (cheader_filename = "gnet.h")]
- public static uint inetaddr_hash (pointer p);
+ public static uint inetaddr_hash (void* p);
[CCode (cheader_filename = "gnet.h")]
public static bool inetaddr_is_broadcast (GNet.InetAddr inetaddr);
[CCode (cheader_filename = "gnet.h")]
@@ -376,25 +370,25 @@
[CCode (cheader_filename = "gnet.h")]
public static weak GNet.InetAddr inetaddr_new (string hostname, int port);
[CCode (cheader_filename = "gnet.h")]
- public static weak GNet.InetAddrNewAsyncID inetaddr_new_async (string hostname, int port, GNet.InetAddrNewAsyncFunc func, pointer data);
+ public static weak GNet.InetAddrNewAsyncID inetaddr_new_async (string hostname, int port, GNet.InetAddrNewAsyncFunc func, void* data);
[CCode (cheader_filename = "gnet.h")]
public static void inetaddr_new_async_cancel (GNet.InetAddrNewAsyncID id);
[CCode (cheader_filename = "gnet.h")]
- public static weak GNet.InetAddrNewAsyncID inetaddr_new_async_full (string hostname, int port, GNet.InetAddrNewAsyncFunc func, pointer data, GLib.DestroyNotify notify, GLib.MainContext context, int priority);
+ public static weak GNet.InetAddrNewAsyncID inetaddr_new_async_full (string hostname, int port, GNet.InetAddrNewAsyncFunc func, void* data, GLib.DestroyNotify notify, GLib.MainContext context, int priority);
[CCode (cheader_filename = "gnet.h")]
public static weak GNet.InetAddr inetaddr_new_bytes (string bytes, uint length);
[CCode (cheader_filename = "gnet.h")]
public static weak GLib.List inetaddr_new_list (string hostname, int port);
[CCode (cheader_filename = "gnet.h")]
- public static weak GNet.InetAddrNewListAsyncID inetaddr_new_list_async (string hostname, int port, GNet.InetAddrNewListAsyncFunc func, pointer data);
+ public static weak GNet.InetAddrNewListAsyncID inetaddr_new_list_async (string hostname, int port, GNet.InetAddrNewListAsyncFunc func, void* data);
[CCode (cheader_filename = "gnet.h")]
public static void inetaddr_new_list_async_cancel (GNet.InetAddrNewListAsyncID id);
[CCode (cheader_filename = "gnet.h")]
- public static weak GNet.InetAddrNewListAsyncID inetaddr_new_list_async_full (string hostname, int port, GNet.InetAddrNewListAsyncFunc func, pointer data, GLib.DestroyNotify notify, GLib.MainContext context, int priority);
+ public static weak GNet.InetAddrNewListAsyncID inetaddr_new_list_async_full (string hostname, int port, GNet.InetAddrNewListAsyncFunc func, void* data, GLib.DestroyNotify notify, GLib.MainContext context, int priority);
[CCode (cheader_filename = "gnet.h")]
public static weak GNet.InetAddr inetaddr_new_nonblock (string hostname, int port);
[CCode (cheader_filename = "gnet.h")]
- public static bool inetaddr_noport_equal (pointer p1, pointer p2);
+ public static bool inetaddr_noport_equal (void* p1, void* p2);
[CCode (cheader_filename = "gnet.h")]
public static void inetaddr_ref (GNet.InetAddr inetaddr);
[CCode (cheader_filename = "gnet.h")]
@@ -410,9 +404,9 @@
[CCode (cheader_filename = "gnet.h")]
public static GNet.IOError io_channel_readline_strdup (GLib.IOChannel channel, string bufferp, ulong bytes_readp);
[CCode (cheader_filename = "gnet.h")]
- public static GNet.IOError io_channel_readn (GLib.IOChannel channel, pointer buffer, ulong length, ulong bytes_readp);
+ public static GNet.IOError io_channel_readn (GLib.IOChannel channel, void* buffer, ulong length, ulong bytes_readp);
[CCode (cheader_filename = "gnet.h")]
- public static GNet.IOError io_channel_writen (GLib.IOChannel channel, pointer buffer, ulong length, ulong bytes_writtenp);
+ public static GNet.IOError io_channel_writen (GLib.IOChannel channel, void* buffer, ulong length, ulong bytes_writtenp);
[CCode (cheader_filename = "gnet.h")]
public static GNet.IPv6Policy ipv6_get_policy ();
[CCode (cheader_filename = "gnet.h")]
@@ -458,7 +452,7 @@
[CCode (cheader_filename = "gnet.h")]
public static void md5_delete (GNet.MD5 md5);
[CCode (cheader_filename = "gnet.h")]
- public static bool md5_equal (pointer p1, pointer p2);
+ public static bool md5_equal (void* p1, void* p2);
[CCode (cheader_filename = "gnet.h")]
public static void md5_final (GNet.MD5 md5);
[CCode (cheader_filename = "gnet.h")]
@@ -466,7 +460,7 @@
[CCode (cheader_filename = "gnet.h")]
public static weak string md5_get_string (GNet.MD5 md5);
[CCode (cheader_filename = "gnet.h")]
- public static uint md5_hash (pointer p);
+ public static uint md5_hash (void* p);
[CCode (cheader_filename = "gnet.h")]
public static weak GNet.MD5 md5_new (string buffer, uint length);
[CCode (cheader_filename = "gnet.h")]
@@ -494,7 +488,7 @@
[CCode (cheader_filename = "gnet.h")]
public static void sha_delete (GNet.SHA sha);
[CCode (cheader_filename = "gnet.h")]
- public static bool sha_equal (pointer p1, pointer p2);
+ public static bool sha_equal (void* p1, void* p2);
[CCode (cheader_filename = "gnet.h")]
public static void sha_final (GNet.SHA sha);
[CCode (cheader_filename = "gnet.h")]
@@ -502,7 +496,7 @@
[CCode (cheader_filename = "gnet.h")]
public static weak string sha_get_string (GNet.SHA sha);
[CCode (cheader_filename = "gnet.h")]
- public static uint sha_hash (pointer p);
+ public static uint sha_hash (void* p);
[CCode (cheader_filename = "gnet.h")]
public static weak GNet.SHA sha_new (string buffer, uint length);
[CCode (cheader_filename = "gnet.h")]
@@ -514,11 +508,11 @@
[CCode (cheader_filename = "gnet.h")]
public static weak GNet.TcpSocket tcp_socket_connect (string hostname, int port);
[CCode (cheader_filename = "gnet.h")]
- public static weak GNet.TcpSocketConnectAsyncID tcp_socket_connect_async (string hostname, int port, GNet.TcpSocketConnectAsyncFunc func, pointer data);
+ public static weak GNet.TcpSocketConnectAsyncID tcp_socket_connect_async (string hostname, int port, GNet.TcpSocketConnectAsyncFunc func, void* data);
[CCode (cheader_filename = "gnet.h")]
public static void tcp_socket_connect_async_cancel (GNet.TcpSocketConnectAsyncID id);
[CCode (cheader_filename = "gnet.h")]
- public static weak GNet.TcpSocketConnectAsyncID tcp_socket_connect_async_full (string hostname, int port, GNet.TcpSocketConnectAsyncFunc func, pointer data, GLib.DestroyNotify notify, GLib.MainContext context, int priority);
+ public static weak GNet.TcpSocketConnectAsyncID tcp_socket_connect_async_full (string hostname, int port, GNet.TcpSocketConnectAsyncFunc func, void* data, GLib.DestroyNotify notify, GLib.MainContext context, int priority);
[CCode (cheader_filename = "gnet.h")]
public static void tcp_socket_delete (GNet.TcpSocket socket);
[CCode (cheader_filename = "gnet.h")]
@@ -532,15 +526,15 @@
[CCode (cheader_filename = "gnet.h")]
public static weak GNet.TcpSocket tcp_socket_new (GNet.InetAddr addr);
[CCode (cheader_filename = "gnet.h")]
- public static weak GNet.TcpSocketNewAsyncID tcp_socket_new_async (GNet.InetAddr addr, GNet.TcpSocketNewAsyncFunc func, pointer data);
+ public static weak GNet.TcpSocketNewAsyncID tcp_socket_new_async (GNet.InetAddr addr, GNet.TcpSocketNewAsyncFunc func, void* data);
[CCode (cheader_filename = "gnet.h")]
public static void tcp_socket_new_async_cancel (GNet.TcpSocketNewAsyncID id);
[CCode (cheader_filename = "gnet.h")]
- public static weak GNet.TcpSocketNewAsyncID tcp_socket_new_async_direct (GNet.InetAddr addr, GNet.TcpSocketNewAsyncFunc func, pointer data);
+ public static weak GNet.TcpSocketNewAsyncID tcp_socket_new_async_direct (GNet.InetAddr addr, GNet.TcpSocketNewAsyncFunc func, void* data);
[CCode (cheader_filename = "gnet.h")]
- public static weak GNet.TcpSocketNewAsyncID tcp_socket_new_async_direct_full (GNet.InetAddr addr, GNet.TcpSocketNewAsyncFunc func, pointer data, GLib.DestroyNotify notify, GLib.MainContext context, int priority);
+ public static weak GNet.TcpSocketNewAsyncID tcp_socket_new_async_direct_full (GNet.InetAddr addr, GNet.TcpSocketNewAsyncFunc func, void* data, GLib.DestroyNotify notify, GLib.MainContext context, int priority);
[CCode (cheader_filename = "gnet.h")]
- public static weak GNet.TcpSocketNewAsyncID tcp_socket_new_async_full (GNet.InetAddr addr, GNet.TcpSocketNewAsyncFunc func, pointer data, GLib.DestroyNotify notify, GLib.MainContext context, int priority);
+ public static weak GNet.TcpSocketNewAsyncID tcp_socket_new_async_full (GNet.InetAddr addr, GNet.TcpSocketNewAsyncFunc func, void* data, GLib.DestroyNotify notify, GLib.MainContext context, int priority);
[CCode (cheader_filename = "gnet.h")]
public static weak GNet.TcpSocket tcp_socket_new_direct (GNet.InetAddr addr);
[CCode (cheader_filename = "gnet.h")]
@@ -618,13 +612,13 @@
[CCode (cheader_filename = "gnet.h")]
public static void uri_delete (GNet.URI uri);
[CCode (cheader_filename = "gnet.h")]
- public static bool uri_equal (pointer p1, pointer p2);
+ public static bool uri_equal (void* p1, void* p2);
[CCode (cheader_filename = "gnet.h")]
public static void uri_escape (GNet.URI uri);
[CCode (cheader_filename = "gnet.h")]
public static weak string uri_get_string (GNet.URI uri);
[CCode (cheader_filename = "gnet.h")]
- public static uint uri_hash (pointer p);
+ public static uint uri_hash (void* p);
[CCode (cheader_filename = "gnet.h")]
public static weak GNet.URI uri_new (string uri);
[CCode (cheader_filename = "gnet.h")]
@@ -650,9 +644,9 @@
[CCode (cheader_filename = "gnet.h")]
public static void uri_unescape (GNet.URI uri);
[CCode (cheader_filename = "gnet.h")]
- public static int vcalcsize (string format, pointer args);
+ public static int vcalcsize (string format, void* args);
[CCode (cheader_filename = "gnet.h")]
- public static int vpack (string format, string buffer, int length, pointer args);
+ public static int vpack (string format, string buffer, int length, void* args);
[CCode (cheader_filename = "gnet.h")]
- public static int vunpack (string format, string buffer, int length, pointer args);
+ public static int vunpack (string format, string buffer, int length, void* args);
}
Modified: trunk/vapi/gnome-desktop-2.0.vapi
==============================================================================
--- trunk/vapi/gnome-desktop-2.0.vapi (original)
+++ trunk/vapi/gnome-desktop-2.0.vapi Sat Apr 19 16:06:52 2008
@@ -2,7 +2,7 @@
[CCode (cprefix = "Gnome", lower_case_cprefix = "gnome_")]
namespace Gnome {
- [CCode (cprefix = "GNOME_DESKTOP_ITEM_ERROR_", cheader_filename = "libgnome/gnome-desktop-item.h")]
+ [CCode (cprefix = "GNOME_DESKTOP_ITEM_ERROR_", has_type_id = "0", cheader_filename = "libgnome/gnome-desktop-item.h")]
public enum DesktopItemError {
NO_FILENAME,
UNKNOWN_ENCODING,
@@ -11,32 +11,32 @@
BAD_EXEC_STRING,
NO_URL,
NOT_LAUNCHABLE,
- INVALID_TYPE,
+ INVALID_TYPE
}
- [CCode (cprefix = "GNOME_DESKTOP_ITEM_ICON_NO_", cheader_filename = "libgnome/gnome-desktop-item.h")]
+ [CCode (cprefix = "GNOME_DESKTOP_ITEM_ICON_NO_", has_type_id = "0", cheader_filename = "libgnome/gnome-desktop-item.h")]
public enum DesktopItemIconFlags {
- KDE,
+ KDE
}
- [CCode (cprefix = "GNOME_DESKTOP_ITEM_LAUNCH_", cheader_filename = "libgnome/gnome-desktop-item.h")]
+ [CCode (cprefix = "GNOME_DESKTOP_ITEM_LAUNCH_", has_type_id = "0", cheader_filename = "libgnome/gnome-desktop-item.h")]
public enum DesktopItemLaunchFlags {
ONLY_ONE,
USE_CURRENT_DIR,
APPEND_URIS,
APPEND_PATHS,
- DO_NOT_REAP_CHILD,
+ DO_NOT_REAP_CHILD
}
- [CCode (cprefix = "GNOME_DESKTOP_ITEM_LOAD_", cheader_filename = "libgnome/gnome-desktop-item.h")]
+ [CCode (cprefix = "GNOME_DESKTOP_ITEM_LOAD_", has_type_id = "0", cheader_filename = "libgnome/gnome-desktop-item.h")]
public enum DesktopItemLoadFlags {
ONLY_IF_EXISTS,
- NO_TRANSLATIONS,
+ NO_TRANSLATIONS
}
- [CCode (cprefix = "GNOME_DESKTOP_ITEM_", cheader_filename = "libgnome/gnome-desktop-item.h")]
+ [CCode (cprefix = "GNOME_DESKTOP_ITEM_", has_type_id = "0", cheader_filename = "libgnome/gnome-desktop-item.h")]
public enum DesktopItemStatus {
UNCHANGED,
CHANGED,
- DISAPPEARED,
+ DISAPPEARED
}
- [CCode (cprefix = "GNOME_DESKTOP_ITEM_TYPE_", cheader_filename = "libgnome/gnome-desktop-item.h")]
+ [CCode (cprefix = "GNOME_DESKTOP_ITEM_TYPE_", has_type_id = "0", cheader_filename = "libgnome/gnome-desktop-item.h")]
public enum DesktopItemType {
NULL,
OTHER,
@@ -46,7 +46,7 @@
MIME_TYPE,
DIRECTORY,
SERVICE,
- SERVICE_TYPE,
+ SERVICE_TYPE
}
[CCode (ref_function = "gnome_desktop_item_ref", unref_function = "gnome_desktop_item_unref", cheader_filename = "libgnome/gnome-desktop-item.h")]
public class DesktopItem : GLib.Boxed {
Modified: trunk/vapi/gnome-keyring-1.vapi
==============================================================================
--- trunk/vapi/gnome-keyring-1.vapi (original)
+++ trunk/vapi/gnome-keyring-1.vapi Sat Apr 19 16:06:52 2008
@@ -114,17 +114,16 @@
[CCode (cheader_filename = "gnome-keyring.h")]
public class PasswordSchema {
public GnomeKeyring.ItemType item_type;
- [NoArrayLength]
- public pointer[] attributes;
- public pointer reserved1;
- public pointer reserved2;
- public pointer reserved3;
+ public void* attributes;
+ public void* reserved1;
+ public void* reserved2;
+ public void* reserved3;
}
[CCode (cheader_filename = "gnome-keyring.h")]
public struct Attribute {
public weak string name;
public GnomeKeyring.AttributeType type;
- public pointer value;
+ public void* value;
}
[CCode (cheader_filename = "gnome-keyring.h")]
public delegate void OperationDoneCallback (GnomeKeyring.Result result);
@@ -151,13 +150,13 @@
[CCode (cheader_filename = "gnome-keyring.h")]
public static void acl_free (GLib.List acl);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static void cancel_request (pointer request);
+ public static void cancel_request (void* request);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer change_password (string keyring, string original, string password, GnomeKeyring.OperationDoneCallback callback, GLib.DestroyNotify destroy_data);
+ public static void* change_password (string keyring, string original, string password, GnomeKeyring.OperationDoneCallback callback, GLib.DestroyNotify destroy_data);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result change_password_sync (string keyring, string original, string password);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer create (string keyring_name, string password, GnomeKeyring.OperationDoneCallback callback, GLib.DestroyNotify destroy_data);
+ public static void* create (string keyring_name, string password, GnomeKeyring.OperationDoneCallback callback, GLib.DestroyNotify destroy_data);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result create_sync (string keyring_name, string password);
[CCode (cheader_filename = "gnome-keyring.h")]
@@ -165,37 +164,37 @@
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result daemon_set_display_sync (string display);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer @delete (string keyring, GnomeKeyring.OperationDoneCallback callback, pointer data, GLib.DestroyNotify destroy_data);
+ public static void* @delete (string keyring, GnomeKeyring.OperationDoneCallback callback, void* data, GLib.DestroyNotify destroy_data);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer delete_password (GnomeKeyring.PasswordSchema schema, GnomeKeyring.OperationDoneCallback callback, GLib.DestroyNotify destroy_data, ...);
+ public static void* delete_password (GnomeKeyring.PasswordSchema schema, GnomeKeyring.OperationDoneCallback callback, GLib.DestroyNotify destroy_data, ...);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result delete_password_sync (GnomeKeyring.PasswordSchema schema, ...);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result delete_sync (string keyring);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer find_items (GnomeKeyring.ItemType type, GnomeKeyring.AttributeList attributes, GnomeKeyring.OperationGetListCallback callback, GLib.DestroyNotify destroy_data);
+ public static void* find_items (GnomeKeyring.ItemType type, GnomeKeyring.AttributeList attributes, GnomeKeyring.OperationGetListCallback callback, GLib.DestroyNotify destroy_data);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result find_items_sync (GnomeKeyring.ItemType type, GnomeKeyring.AttributeList attributes, GLib.List found);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer find_itemsv (GnomeKeyring.ItemType type, GnomeKeyring.OperationGetListCallback callback, GLib.DestroyNotify destroy_data, ...);
+ public static void* find_itemsv (GnomeKeyring.ItemType type, GnomeKeyring.OperationGetListCallback callback, GLib.DestroyNotify destroy_data, ...);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result find_itemsv_sync (GnomeKeyring.ItemType type, GLib.List found, ...);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer find_network_password (string user, string domain, string server, string object, string protocol, string authtype, uint port, GnomeKeyring.OperationGetListCallback callback, GLib.DestroyNotify destroy_data);
+ public static void* find_network_password (string user, string domain, string server, string object, string protocol, string authtype, uint port, GnomeKeyring.OperationGetListCallback callback, GLib.DestroyNotify destroy_data);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result find_network_password_sync (string user, string domain, string server, string object, string protocol, string authtype, uint port, GLib.List results);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer find_password (GnomeKeyring.PasswordSchema schema, GnomeKeyring.OperationGetStringCallback callback, GLib.DestroyNotify destroy_data, ...);
+ public static void* find_password (GnomeKeyring.PasswordSchema schema, GnomeKeyring.OperationGetStringCallback callback, GLib.DestroyNotify destroy_data, ...);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result find_password_sync (GnomeKeyring.PasswordSchema schema, string password, ...);
[CCode (cheader_filename = "gnome-keyring.h")]
public static void free_password (string password);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer get_default_keyring (GnomeKeyring.OperationGetStringCallback callback, GLib.DestroyNotify destroy_data);
+ public static void* get_default_keyring (GnomeKeyring.OperationGetStringCallback callback, GLib.DestroyNotify destroy_data);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result get_default_keyring_sync (out weak string keyring);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer get_info (string keyring, GnomeKeyring.OperationGetKeyringInfoCallback callback, GLib.DestroyNotify destroy_data);
+ public static void* get_info (string keyring, GnomeKeyring.OperationGetKeyringInfoCallback callback, GLib.DestroyNotify destroy_data);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result get_info_sync (string keyring, out weak GnomeKeyring.Info info);
[CCode (cheader_filename = "gnome-keyring.h")]
@@ -213,75 +212,75 @@
[CCode (cheader_filename = "gnome-keyring.h")]
public static void item_ac_set_path_name (GnomeKeyring.AccessControl ac, string value);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer item_create (string keyring, GnomeKeyring.ItemType type, string display_name, GnomeKeyring.AttributeList attributes, string secret, bool update_if_exists, GnomeKeyring.OperationGetIntCallback callback, GLib.DestroyNotify destroy_data);
+ public static void* item_create (string keyring, GnomeKeyring.ItemType type, string display_name, GnomeKeyring.AttributeList attributes, string secret, bool update_if_exists, GnomeKeyring.OperationGetIntCallback callback, GLib.DestroyNotify destroy_data);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result item_create_sync (string keyring, GnomeKeyring.ItemType type, string display_name, GnomeKeyring.AttributeList attributes, string secret, bool update_if_exists, uint item_id);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer item_delete (string keyring, uint id, GnomeKeyring.OperationDoneCallback callback, GLib.DestroyNotify destroy_data);
+ public static void* item_delete (string keyring, uint id, GnomeKeyring.OperationDoneCallback callback, GLib.DestroyNotify destroy_data);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result item_delete_sync (string keyring, uint id);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer item_get_acl (string keyring, uint id, GnomeKeyring.OperationGetListCallback callback, GLib.DestroyNotify destroy_data);
+ public static void* item_get_acl (string keyring, uint id, GnomeKeyring.OperationGetListCallback callback, GLib.DestroyNotify destroy_data);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result item_get_acl_sync (string keyring, uint id, GLib.List acl);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer item_get_attributes (string keyring, uint id, GnomeKeyring.OperationGetAttributesCallback callback, GLib.DestroyNotify destroy_data);
+ public static void* item_get_attributes (string keyring, uint id, GnomeKeyring.OperationGetAttributesCallback callback, GLib.DestroyNotify destroy_data);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result item_get_attributes_sync (string keyring, uint id, out weak GnomeKeyring.AttributeList attributes);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer item_get_info (string keyring, uint id, GnomeKeyring.OperationGetItemInfoCallback callback, GLib.DestroyNotify destroy_data);
+ public static void* item_get_info (string keyring, uint id, GnomeKeyring.OperationGetItemInfoCallback callback, GLib.DestroyNotify destroy_data);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer item_get_info_full (string keyring, uint id, uint flags, GnomeKeyring.OperationGetItemInfoCallback callback, GLib.DestroyNotify destroy_data);
+ public static void* item_get_info_full (string keyring, uint id, uint flags, GnomeKeyring.OperationGetItemInfoCallback callback, GLib.DestroyNotify destroy_data);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result item_get_info_full_sync (string keyring, uint id, uint flags, out weak GnomeKeyring.ItemInfo info);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result item_get_info_sync (string keyring, uint id, out weak GnomeKeyring.ItemInfo info);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer item_grant_access_rights (string keyring, string display_name, string full_path, uint id, GnomeKeyring.AccessType rights, GnomeKeyring.OperationDoneCallback callback, GLib.DestroyNotify destroy_data);
+ public static void* item_grant_access_rights (string keyring, string display_name, string full_path, uint id, GnomeKeyring.AccessType rights, GnomeKeyring.OperationDoneCallback callback, GLib.DestroyNotify destroy_data);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result item_grant_access_rights_sync (string keyring, string display_name, string full_path, uint id, GnomeKeyring.AccessType rights);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer item_set_acl (string keyring, uint id, GLib.List acl, GnomeKeyring.OperationDoneCallback callback, GLib.DestroyNotify destroy_data);
+ public static void* item_set_acl (string keyring, uint id, GLib.List acl, GnomeKeyring.OperationDoneCallback callback, GLib.DestroyNotify destroy_data);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result item_set_acl_sync (string keyring, uint id, GLib.List acl);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer item_set_attributes (string keyring, uint id, GnomeKeyring.AttributeList attributes, GnomeKeyring.OperationDoneCallback callback, GLib.DestroyNotify destroy_data);
+ public static void* item_set_attributes (string keyring, uint id, GnomeKeyring.AttributeList attributes, GnomeKeyring.OperationDoneCallback callback, GLib.DestroyNotify destroy_data);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result item_set_attributes_sync (string keyring, uint id, GnomeKeyring.AttributeList attributes);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer item_set_info (string keyring, uint id, GnomeKeyring.ItemInfo info, GnomeKeyring.OperationDoneCallback callback, GLib.DestroyNotify destroy_data);
+ public static void* item_set_info (string keyring, uint id, GnomeKeyring.ItemInfo info, GnomeKeyring.OperationDoneCallback callback, GLib.DestroyNotify destroy_data);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result item_set_info_sync (string keyring, uint id, GnomeKeyring.ItemInfo info);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer list_item_ids (string keyring, GnomeKeyring.OperationGetListCallback callback, GLib.DestroyNotify destroy_data);
+ public static void* list_item_ids (string keyring, GnomeKeyring.OperationGetListCallback callback, GLib.DestroyNotify destroy_data);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result list_item_ids_sync (string keyring, out GLib.List<uint> ids);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer list_keyring_names (GnomeKeyring.OperationGetListCallback callback, GLib.DestroyNotify destroy_data);
+ public static void* list_keyring_names (GnomeKeyring.OperationGetListCallback callback, GLib.DestroyNotify destroy_data);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result list_keyring_names_sync (GLib.List keyrings);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer @lock (string keyring, GnomeKeyring.OperationDoneCallback callback, pointer data, GLib.DestroyNotify destroy_data);
+ public static void* @lock (string keyring, GnomeKeyring.OperationDoneCallback callback, void* data, GLib.DestroyNotify destroy_data);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer lock_all (GnomeKeyring.OperationDoneCallback callback, GLib.DestroyNotify destroy_data);
+ public static void* lock_all (GnomeKeyring.OperationDoneCallback callback, GLib.DestroyNotify destroy_data);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result lock_all_sync ();
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result lock_sync (string keyring);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer memory_alloc (ulong sz);
+ public static void* memory_alloc (ulong sz);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static void memory_free (pointer p);
+ public static void memory_free (void* p);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static bool memory_is_secure (pointer p);
+ public static bool memory_is_secure (void* p);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer memory_realloc (pointer p, ulong sz);
+ public static void* memory_realloc (void* p, ulong sz);
[CCode (cheader_filename = "gnome-keyring.h")]
public static weak string memory_strdup (string str);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer memory_try_alloc (ulong sz);
+ public static void* memory_try_alloc (ulong sz);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer memory_try_realloc (pointer p, ulong sz);
+ public static void* memory_try_realloc (void* p, ulong sz);
[CCode (cheader_filename = "gnome-keyring.h")]
public static void network_password_free (GnomeKeyring.NetworkPasswordData data);
[CCode (cheader_filename = "gnome-keyring.h")]
@@ -289,25 +288,25 @@
[CCode (cheader_filename = "gnome-keyring.h")]
public static weak string result_to_message (GnomeKeyring.Result res);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer set_default_keyring (string keyring, GnomeKeyring.OperationDoneCallback callback, GLib.DestroyNotify destroy_data);
+ public static void* set_default_keyring (string keyring, GnomeKeyring.OperationDoneCallback callback, GLib.DestroyNotify destroy_data);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result set_default_keyring_sync (string keyring);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer set_info (string keyring, GnomeKeyring.Info info, GnomeKeyring.OperationDoneCallback callback, GLib.DestroyNotify destroy_data);
+ public static void* set_info (string keyring, GnomeKeyring.Info info, GnomeKeyring.OperationDoneCallback callback, GLib.DestroyNotify destroy_data);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result set_info_sync (string keyring, GnomeKeyring.Info info);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer set_network_password (string keyring, string user, string domain, string server, string object, string protocol, string authtype, uint port, string password, GnomeKeyring.OperationGetIntCallback callback, GLib.DestroyNotify destroy_data);
+ public static void* set_network_password (string keyring, string user, string domain, string server, string object, string protocol, string authtype, uint port, string password, GnomeKeyring.OperationGetIntCallback callback, GLib.DestroyNotify destroy_data);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result set_network_password_sync (string keyring, string user, string domain, string server, string object, string protocol, string authtype, uint port, string password, uint item_id);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer store_password (GnomeKeyring.PasswordSchema schema, string keyring, string display_name, string password, GnomeKeyring.OperationDoneCallback callback, GLib.DestroyNotify destroy_data, ...);
+ public static void* store_password (GnomeKeyring.PasswordSchema schema, string keyring, string display_name, string password, GnomeKeyring.OperationDoneCallback callback, GLib.DestroyNotify destroy_data, ...);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result store_password_sync (GnomeKeyring.PasswordSchema schema, string keyring, string display_name, string password, ...);
[CCode (cheader_filename = "gnome-keyring.h")]
public static void string_list_free (GLib.List strings);
[CCode (cheader_filename = "gnome-keyring.h")]
- public static pointer unlock (string keyring, string password, GnomeKeyring.OperationDoneCallback callback, GLib.DestroyNotify destroy_data);
+ public static void* unlock (string keyring, string password, GnomeKeyring.OperationDoneCallback callback, GLib.DestroyNotify destroy_data);
[CCode (cheader_filename = "gnome-keyring.h")]
public static GnomeKeyring.Result unlock_sync (string keyring, string password);
}
Modified: trunk/vapi/gnome-vfs-2.0.vapi
==============================================================================
--- trunk/vapi/gnome-vfs-2.0.vapi (original)
+++ trunk/vapi/gnome-vfs-2.0.vapi Sat Apr 19 16:06:52 2008
@@ -2,12 +2,12 @@
[CCode (cprefix = "GnomeVFS", lower_case_cprefix = "gnome_vfs_")]
namespace GnomeVFS {
- [CCode (cprefix = "GNOME_VFS_DNS_SD_SERVICE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_DNS_SD_SERVICE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
public enum DNSSDServiceStatus {
ADDED,
- REMOVED,
+ REMOVED
}
- [CCode (cprefix = "GNOME_VFS_DEVICE_TYPE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_DEVICE_TYPE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
public enum DeviceType {
UNKNOWN,
AUDIO_CD,
@@ -26,9 +26,9 @@
MUSIC_PLAYER,
WINDOWS,
LOOPBACK,
- NETWORK,
+ NETWORK
}
- [CCode (cprefix = "GNOME_VFS_FILE_TYPE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_FILE_TYPE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
public enum FileType {
UNKNOWN,
REGULAR,
@@ -37,51 +37,51 @@
SOCKET,
CHARACTER_DEVICE,
BLOCK_DEVICE,
- SYMBOLIC_LINK,
+ SYMBOLIC_LINK
}
- [CCode (cprefix = "GNOME_VFS_DIRECTORY_KIND_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_DIRECTORY_KIND_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
public enum FindDirectoryKind {
DESKTOP,
- TRASH,
+ TRASH
}
- [CCode (cprefix = "GNOME_VFS_MIME_ACTION_TYPE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_MIME_ACTION_TYPE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
public enum MimeActionType {
NONE,
APPLICATION,
- COMPONENT,
+ COMPONENT
}
- [CCode (cprefix = "GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
public enum MimeApplicationArgumentType {
URIS,
PATHS,
- URIS_FOR_NON_FILES,
+ URIS_FOR_NON_FILES
}
- [CCode (cprefix = "GNOME_VFS_MIME_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_MIME_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
public enum MimeEquivalence {
UNRELATED,
IDENTICAL,
- PARENT,
+ PARENT
}
- [CCode (cprefix = "", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
public enum ModuleCallbackAuthenticationAuthType {
AuthTypeBasic,
- AuthTypeDigest,
+ AuthTypeDigest
}
- [CCode (cprefix = "GNOME_VFS_MONITOR_EVENT_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_MONITOR_EVENT_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
public enum MonitorEventType {
CHANGED,
DELETED,
STARTEXECUTING,
STOPEXECUTING,
CREATED,
- METADATA_CHANGED,
+ METADATA_CHANGED
}
- [CCode (cprefix = "GNOME_VFS_MONITOR_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_MONITOR_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
public enum MonitorType {
FILE,
- DIRECTORY,
+ DIRECTORY
}
- [CCode (cprefix = "GNOME_VFS_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
public enum Result {
OK,
ERROR_NOT_FOUND,
@@ -135,47 +135,47 @@
ERROR_DEPRECATED_FUNCTION,
ERROR_INVALID_FILENAME,
ERROR_NOT_A_SYMBOLIC_LINK,
- NUM_ERRORS,
+ NUM_ERRORS
}
- [CCode (cprefix = "GNOME_VFS_SEEK_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_SEEK_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
public enum SeekPosition {
START,
CURRENT,
- END,
+ END
}
- [CCode (cprefix = "GNOME_VFS_VOLUME_TYPE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_VOLUME_TYPE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
public enum VolumeType {
MOUNTPOINT,
VFS_MOUNT,
- CONNECTED_SERVER,
+ CONNECTED_SERVER
}
- [CCode (cprefix = "GNOME_VFS_XFER_ERROR_ACTION_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_XFER_ERROR_ACTION_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
public enum XferErrorAction {
ABORT,
RETRY,
- SKIP,
+ SKIP
}
- [CCode (cprefix = "GNOME_VFS_XFER_ERROR_MODE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_XFER_ERROR_MODE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
public enum XferErrorMode {
ABORT,
- QUERY,
+ QUERY
}
- [CCode (cprefix = "GNOME_VFS_XFER_OVERWRITE_ACTION_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_XFER_OVERWRITE_ACTION_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
public enum XferOverwriteAction {
ABORT,
REPLACE,
REPLACE_ALL,
SKIP,
- SKIP_ALL,
+ SKIP_ALL
}
- [CCode (cprefix = "GNOME_VFS_XFER_OVERWRITE_MODE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_XFER_OVERWRITE_MODE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
public enum XferOverwriteMode {
ABORT,
QUERY,
REPLACE,
- SKIP,
+ SKIP
}
- [CCode (cprefix = "GNOME_VFS_XFER_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_XFER_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
public enum XferPhase {
PHASE_INITIAL,
CHECKING_DESTINATION,
@@ -194,31 +194,31 @@
PHASE_FILECOMPLETED,
PHASE_CLEANUP,
PHASE_COMPLETED,
- NUM_PHASES,
+ NUM_PHASES
}
- [CCode (cprefix = "GNOME_VFS_XFER_PROGRESS_STATUS_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_XFER_PROGRESS_STATUS_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
public enum XferProgressStatus {
OK,
VFSERROR,
OVERWRITE,
- DUPLICATE,
+ DUPLICATE
}
- [CCode (cprefix = "GNOME_VFS_DIRECTORY_VISIT_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_DIRECTORY_VISIT_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
[Flags]
public enum DirectoryVisitOptions {
DEFAULT,
SAMEFS,
LOOPCHECK,
- IGNORE_RECURSE_ERROR,
+ IGNORE_RECURSE_ERROR
}
- [CCode (cprefix = "GNOME_VFS_FILE_FLAGS_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_FILE_FLAGS_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
[Flags]
public enum FileFlags {
NONE,
SYMLINK,
- LOCAL,
+ LOCAL
}
- [CCode (cprefix = "GNOME_VFS_FILE_INFO_FIELDS_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_FILE_INFO_FIELDS_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
[Flags]
public enum FileInfoFields {
NONE,
@@ -239,9 +239,9 @@
ACCESS,
IDS,
ACL,
- SELINUX_CONTEXT,
+ SELINUX_CONTEXT
}
- [CCode (cprefix = "GNOME_VFS_FILE_INFO_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_FILE_INFO_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
[Flags]
public enum FileInfoOptions {
DEFAULT,
@@ -252,9 +252,9 @@
GET_ACCESS_RIGHTS,
NAME_ONLY,
GET_ACL,
- GET_SELINUX_CONTEXT,
+ GET_SELINUX_CONTEXT
}
- [CCode (cprefix = "GNOME_VFS_PERM_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_PERM_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
[Flags]
public enum FilePermissions {
SUID,
@@ -274,16 +274,16 @@
OTHER_ALL,
ACCESS_READABLE,
ACCESS_WRITABLE,
- ACCESS_EXECUTABLE,
+ ACCESS_EXECUTABLE
}
- [CCode (cprefix = "GNOME_VFS_MAKE_URI_DIR_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_MAKE_URI_DIR_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
[Flags]
public enum MakeURIDirs {
NONE,
HOMEDIR,
- CURRENT,
+ CURRENT
}
- [CCode (cprefix = "GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
[Flags]
public enum ModuleCallbackFullAuthenticationFlags {
PREVIOUS_ATTEMPT_FAILED,
@@ -291,23 +291,23 @@
NEED_USERNAME,
NEED_DOMAIN,
SAVING_SUPPORTED,
- ANON_SUPPORTED,
+ ANON_SUPPORTED
}
- [CCode (cprefix = "GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_OUT_ANON_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_OUT_ANON_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
[Flags]
public enum ModuleCallbackFullAuthenticationOutFlags {
- SELECTED,
+ SELECTED
}
- [CCode (cprefix = "GNOME_VFS_OPEN_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_OPEN_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
[Flags]
public enum OpenMode {
NONE,
READ,
WRITE,
RANDOM,
- TRUNCATE,
+ TRUNCATE
}
- [CCode (cprefix = "GNOME_VFS_SET_FILE_INFO_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_SET_FILE_INFO_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
[Flags]
public enum SetFileInfoMask {
NONE,
@@ -317,9 +317,9 @@
TIME,
ACL,
SELINUX_CONTEXT,
- SYMLINK_NAME,
+ SYMLINK_NAME
}
- [CCode (cprefix = "GNOME_VFS_URI_HIDE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_URI_HIDE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
[Flags]
public enum URIHideOptions {
NONE,
@@ -328,9 +328,9 @@
HOST_NAME,
HOST_PORT,
TOPLEVEL_METHOD,
- FRAGMENT_IDENTIFIER,
+ FRAGMENT_IDENTIFIER
}
- [CCode (cprefix = "GNOME_VFS_XFER_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+ [CCode (cprefix = "GNOME_VFS_XFER_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
[Flags]
public enum XferOptions {
DEFAULT,
@@ -346,7 +346,7 @@
USE_UNIQUE_NAMES,
LINK_ITEMS,
FOLLOW_LINKS_RECURSIVE,
- TARGET_DEFAULT_PERMS,
+ TARGET_DEFAULT_PERMS
}
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public class ACLKind {
@@ -401,8 +401,8 @@
public class FindDirectoryResult {
public weak GnomeVFS.URI uri;
public GnomeVFS.Result result;
- public pointer reserved1;
- public pointer reserved2;
+ public void* reserved1;
+ public void* reserved2;
public weak GnomeVFS.FindDirectoryResult dup ();
}
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
@@ -424,8 +424,8 @@
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public class MimeAction {
public GnomeVFS.MimeActionType action_type;
- public pointer action;
- public pointer reserved1;
+ public void* action;
+ public void* reserved1;
public GnomeVFS.Result launch (GLib.List uris);
public GnomeVFS.Result launch_with_env (GLib.List uris, out weak string envp);
}
@@ -437,7 +437,7 @@
public bool can_open_multiple_files;
public GnomeVFS.MimeApplicationArgumentType expects_uris;
public weak GLib.List supported_uri_schemes;
- public pointer reserved1;
+ public void* reserved1;
public weak GnomeVFS.MimeApplication copy ();
public bool equal (GnomeVFS.MimeApplication app_b);
public weak string get_binary_name ();
@@ -460,14 +460,14 @@
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public class ModuleCallbackAdditionalHeadersIn {
public weak GnomeVFS.URI uri;
- public pointer reserved1;
- public pointer reserved2;
+ public void* reserved1;
+ public void* reserved2;
}
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public class ModuleCallbackAdditionalHeadersOut {
public weak GLib.List headers;
- public pointer reserved1;
- public pointer reserved2;
+ public void* reserved1;
+ public void* reserved2;
}
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public class ModuleCallbackAuthenticationIn {
@@ -475,15 +475,15 @@
public weak string realm;
public bool previous_attempt_failed;
public GnomeVFS.ModuleCallbackAuthenticationAuthType auth_type;
- public pointer reserved1;
- public pointer reserved2;
+ public void* reserved1;
+ public void* reserved2;
}
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public class ModuleCallbackAuthenticationOut {
public weak string username;
public weak string password;
- public pointer reserved1;
- public pointer reserved2;
+ public void* reserved1;
+ public void* reserved2;
}
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public class ModuleCallbackFillAuthenticationIn {
@@ -495,8 +495,8 @@
public weak string authtype;
public weak string username;
public weak string domain;
- public pointer reserved1;
- public pointer reserved2;
+ public void* reserved1;
+ public void* reserved2;
}
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public class ModuleCallbackFillAuthenticationOut {
@@ -504,8 +504,8 @@
public weak string username;
public weak string domain;
public weak string password;
- public pointer reserved1;
- public pointer reserved2;
+ public void* reserved1;
+ public void* reserved2;
}
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public class ModuleCallbackFullAuthenticationIn {
@@ -520,8 +520,8 @@
public weak string domain;
public weak string default_user;
public weak string default_domain;
- public pointer reserved1;
- public pointer reserved2;
+ public void* reserved1;
+ public void* reserved2;
}
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public class ModuleCallbackFullAuthenticationOut {
@@ -532,34 +532,34 @@
public bool save_password;
public weak string keyring;
public ulong out_flags;
- public pointer reserved2;
+ public void* reserved2;
}
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public class ModuleCallbackQuestionIn {
public weak string primary_message;
public weak string secondary_message;
public weak string choices;
- public pointer reserved1;
- public pointer reserved2;
+ public void* reserved1;
+ public void* reserved2;
}
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public class ModuleCallbackQuestionOut {
public int answer;
- public pointer reserved1;
- public pointer reserved2;
+ public void* reserved1;
+ public void* reserved2;
}
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public class ModuleCallbackReceivedHeadersIn {
public weak GnomeVFS.URI uri;
public weak GLib.List headers;
- public pointer reserved1;
- public pointer reserved2;
+ public void* reserved1;
+ public void* reserved2;
}
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public class ModuleCallbackReceivedHeadersOut {
public int dummy;
- public pointer reserved1;
- public pointer reserved2;
+ public void* reserved1;
+ public void* reserved2;
}
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public class ModuleCallbackSaveAuthenticationIn {
@@ -573,27 +573,27 @@
public weak string username;
public weak string domain;
public weak string password;
- public pointer reserved1;
- public pointer reserved2;
+ public void* reserved1;
+ public void* reserved2;
}
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public class ModuleCallbackSaveAuthenticationOut {
- public pointer reserved1;
- public pointer reserved2;
+ public void* reserved1;
+ public void* reserved2;
}
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public class ModuleCallbackStatusMessageIn {
public weak string uri;
public weak string message;
public int percentage;
- public pointer reserved1;
- public pointer reserved2;
+ public void* reserved1;
+ public void* reserved2;
}
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public class ModuleCallbackStatusMessageOut {
public int dummy;
- public pointer reserved1;
- public pointer reserved2;
+ public void* reserved1;
+ public void* reserved2;
}
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public class MonitorHandle {
@@ -603,13 +603,13 @@
public weak GnomeVFS.XferProgressInfo progress_info;
public GnomeVFS.XferProgressCallback sync_callback;
public GnomeVFS.XferProgressCallback update_callback;
- public pointer user_data;
- public pointer async_job_data;
+ public void* user_data;
+ public void* async_job_data;
public int64 next_update_callback_time;
public int64 next_text_update_callback_time;
public int64 update_callback_period;
- public pointer reserved1;
- public pointer reserved2;
+ public void* reserved1;
+ public void* reserved2;
}
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public class ResolveHandle {
@@ -622,8 +622,8 @@
public weak string user_name;
public weak string password;
public weak string urn;
- public pointer reserved1;
- public pointer reserved2;
+ public void* reserved1;
+ public void* reserved2;
}
[CCode (ref_function = "gnome_vfs_uri_ref", unref_function = "gnome_vfs_uri_unref", cheader_filename = "libgnomevfs/gnome-vfs.h")]
public class URI {
@@ -631,10 +631,10 @@
public weak string text;
public weak string fragment_id;
public weak string method_string;
- public pointer method;
- public pointer parent;
- public pointer reserved1;
- public pointer reserved2;
+ public void* method;
+ public void* parent;
+ public void* reserved1;
+ public void* reserved2;
public weak GnomeVFS.URI append_file_name (string filename);
public weak GnomeVFS.URI append_path (string path);
public weak GnomeVFS.URI append_string (string uri_fragment);
@@ -654,8 +654,8 @@
public weak GnomeVFS.ToplevelURI get_toplevel ();
public weak string get_user_name ();
public bool has_parent ();
- public static uint hash (pointer p);
- public static int hequal (pointer a, pointer b);
+ public static uint hash (void* p);
+ public static int hequal (void* a, void* b);
public bool is_local ();
public bool is_parent (GnomeVFS.URI possible_child, bool recursive);
public static weak GLib.List list_copy (GLib.List list);
@@ -689,8 +689,8 @@
public weak string duplicate_name;
public int duplicate_count;
public bool top_level_item;
- public pointer reserved1;
- public pointer reserved2;
+ public void* reserved1;
+ public void* reserved2;
}
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public class Address : GLib.Boxed {
@@ -698,7 +698,7 @@
public bool equal (GnomeVFS.Address b);
public int get_family_type ();
public uint get_ipv4 ();
- public pointer get_sockaddr (ushort port, int len);
+ public void* get_sockaddr (ushort port, int len);
public bool match (GnomeVFS.Address b, uint prefix);
public Address.from_ipv4 (uint ipv4_address);
public Address.from_string (string address);
@@ -726,9 +726,9 @@
public uint refcount;
public weak GnomeVFS.ACL acl;
public weak string selinux_context;
- public pointer reserved1;
- public pointer reserved2;
- public pointer reserved3;
+ public void* reserved1;
+ public void* reserved2;
+ public void* reserved3;
public void clear ();
public void copy (GnomeVFS.FileInfo src);
public weak GnomeVFS.FileInfo dup ();
@@ -777,7 +777,7 @@
public weak uint kind { get; set construct; }
public weak bool negative { get; set; }
[NoAccessorMethod]
- public weak pointer permissions { get; set construct; }
+ public weak void* permissions { get; set construct; }
}
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public class ACL : GLib.Object {
@@ -857,47 +857,47 @@
public signal void volume_unmounted (GnomeVFS.Volume volume);
}
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static delegate void AsyncCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, pointer callback_data);
+ public static delegate void AsyncCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static delegate void AsyncCloseCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, pointer callback_data);
+ public static delegate void AsyncCloseCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static delegate void AsyncCreateAsChannelCallback (GnomeVFS.AsyncHandle handle, GLib.IOChannel channel, GnomeVFS.Result result, pointer callback_data);
+ public static delegate void AsyncCreateAsChannelCallback (GnomeVFS.AsyncHandle handle, GLib.IOChannel channel, GnomeVFS.Result result, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static delegate void AsyncCreateCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, pointer callback_data);
+ public static delegate void AsyncCreateCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static delegate void AsyncDirectoryLoadCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, GLib.List list, uint entries_read, pointer callback_data);
+ public static delegate void AsyncDirectoryLoadCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, GLib.List list, uint entries_read, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static delegate void AsyncFileControlCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, pointer operation_data, pointer callback_data);
+ public static delegate void AsyncFileControlCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, void* operation_data, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public delegate void AsyncFindDirectoryCallback (GnomeVFS.AsyncHandle handle, GLib.List results);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static delegate void AsyncGetFileInfoCallback (GnomeVFS.AsyncHandle handle, GLib.List results, pointer callback_data);
+ public static delegate void AsyncGetFileInfoCallback (GnomeVFS.AsyncHandle handle, GLib.List results, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static delegate void AsyncModuleCallback (pointer @in, ulong in_size, pointer @out, ulong out_size, pointer callback_data, GnomeVFS.ModuleCallbackResponse response, pointer response_data);
+ public static delegate void AsyncModuleCallback (void* @in, ulong in_size, void* @out, ulong out_size, void* callback_data, GnomeVFS.ModuleCallbackResponse response, void* response_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static delegate void AsyncOpenAsChannelCallback (GnomeVFS.AsyncHandle handle, GLib.IOChannel channel, GnomeVFS.Result result, pointer callback_data);
+ public static delegate void AsyncOpenAsChannelCallback (GnomeVFS.AsyncHandle handle, GLib.IOChannel channel, GnomeVFS.Result result, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static delegate void AsyncOpenCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, pointer callback_data);
+ public static delegate void AsyncOpenCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static delegate void AsyncReadCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, pointer buffer, GnomeVFS.FileSize bytes_requested, GnomeVFS.FileSize bytes_read, pointer callback_data);
+ public static delegate void AsyncReadCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, void* buffer, GnomeVFS.FileSize bytes_requested, GnomeVFS.FileSize bytes_read, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static delegate void AsyncSeekCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, pointer callback_data);
+ public static delegate void AsyncSeekCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static delegate void AsyncSetFileInfoCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, GnomeVFS.FileInfo file_info, pointer callback_data);
+ public static delegate void AsyncSetFileInfoCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, GnomeVFS.FileInfo file_info, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- 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 void AsyncWriteCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, void* buffer, GnomeVFS.FileSize bytes_requested, GnomeVFS.FileSize bytes_written, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public delegate int AsyncXferProgressCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.XferProgressInfo info);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static delegate void DNSSDBrowseCallback (GnomeVFS.DNSSDBrowseHandle handle, GnomeVFS.DNSSDServiceStatus status, GnomeVFS.DNSSDService service, pointer callback_data);
+ public static delegate void DNSSDBrowseCallback (GnomeVFS.DNSSDBrowseHandle handle, GnomeVFS.DNSSDServiceStatus status, GnomeVFS.DNSSDService service, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- 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 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, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static delegate bool DirectoryVisitFunc (string rel_path, GnomeVFS.FileInfo info, bool recursing_will_loop, pointer user_data, bool recurse);
+ public static delegate bool DirectoryVisitFunc (string rel_path, GnomeVFS.FileInfo info, bool recursing_will_loop, void* user_data, bool recurse);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static delegate void ModuleCallback (pointer @in, ulong in_size, pointer @out, ulong out_size, pointer callback_data);
+ public static delegate void ModuleCallback (void* @in, ulong in_size, void* @out, ulong out_size, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static delegate void ModuleCallbackResponse (pointer response_data);
+ public static delegate void ModuleCallbackResponse (void* response_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public delegate void MonitorCallback (GnomeVFS.MonitorHandle handle, string monitor_uri, string info_uri, GnomeVFS.MonitorEventType event_type);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
@@ -982,55 +982,55 @@
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static void async_cancel (GnomeVFS.AsyncHandle handle);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static void async_close (GnomeVFS.AsyncHandle handle, GnomeVFS.AsyncCloseCallback callback, pointer callback_data);
+ public static void async_close (GnomeVFS.AsyncHandle handle, GnomeVFS.AsyncCloseCallback callback, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static void async_create (out weak GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data);
+ public static void async_create (out weak GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncOpenCallback callback, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static void async_create_as_channel (out weak GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncCreateAsChannelCallback callback, pointer callback_data);
+ public static void async_create_as_channel (out weak GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncCreateAsChannelCallback callback, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static void async_create_symbolic_link (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, string uri_reference, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data);
+ public static void async_create_symbolic_link (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, string uri_reference, int priority, GnomeVFS.AsyncOpenCallback callback, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static void async_create_uri (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data);
+ public static void async_create_uri (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncOpenCallback callback, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static void async_create_uri_as_channel (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncCreateAsChannelCallback callback, pointer callback_data);
+ public static void async_create_uri_as_channel (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncCreateAsChannelCallback callback, void* callback_data);
[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);
+ public static void async_file_control (GnomeVFS.AsyncHandle handle, string operation, void* operation_data, GLib.DestroyNotify operation_data_destroy_func, GnomeVFS.AsyncFileControlCallback callback, void* 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);
[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);
+ 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, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static int async_get_job_limit ();
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static void async_load_directory (out weak GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.FileInfoOptions options, uint items_per_notification, int priority, GnomeVFS.AsyncDirectoryLoadCallback callback, pointer callback_data);
+ public static void async_load_directory (out weak GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.FileInfoOptions options, uint items_per_notification, int priority, GnomeVFS.AsyncDirectoryLoadCallback callback, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static void async_load_directory_uri (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.FileInfoOptions options, uint items_per_notification, int priority, GnomeVFS.AsyncDirectoryLoadCallback callback, pointer callback_data);
+ public static void async_load_directory_uri (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.FileInfoOptions options, uint items_per_notification, int priority, GnomeVFS.AsyncDirectoryLoadCallback callback, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static void async_module_callback_pop (string callback_name);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static void async_module_callback_push (string callback_name, GnomeVFS.AsyncModuleCallback callback, pointer callback_data, GLib.DestroyNotify destroy_notify);
+ public static void async_module_callback_push (string callback_name, GnomeVFS.AsyncModuleCallback callback, void* callback_data, GLib.DestroyNotify destroy_notify);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static void async_module_callback_set_default (string callback_name, GnomeVFS.AsyncModuleCallback callback, pointer callback_data, GLib.DestroyNotify destroy_notify);
+ public static void async_module_callback_set_default (string callback_name, GnomeVFS.AsyncModuleCallback callback, void* callback_data, GLib.DestroyNotify destroy_notify);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static void async_open (out weak GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data);
+ public static void async_open (out weak GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, int priority, GnomeVFS.AsyncOpenCallback callback, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static void async_open_as_channel (out weak GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, uint advised_block_size, int priority, GnomeVFS.AsyncOpenAsChannelCallback callback, pointer callback_data);
+ public static void async_open_as_channel (out weak GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, uint advised_block_size, int priority, GnomeVFS.AsyncOpenAsChannelCallback callback, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static void async_open_uri (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data);
+ public static void async_open_uri (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, int priority, GnomeVFS.AsyncOpenCallback callback, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static void async_open_uri_as_channel (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, uint advised_block_size, int priority, GnomeVFS.AsyncOpenAsChannelCallback callback, pointer callback_data);
+ public static void async_open_uri_as_channel (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, uint advised_block_size, int priority, GnomeVFS.AsyncOpenAsChannelCallback callback, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static void async_read (GnomeVFS.AsyncHandle handle, pointer buffer, uint bytes, GnomeVFS.AsyncReadCallback callback, pointer callback_data);
+ public static void async_read (GnomeVFS.AsyncHandle handle, void* buffer, uint bytes, GnomeVFS.AsyncReadCallback callback, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static void async_seek (GnomeVFS.AsyncHandle handle, GnomeVFS.SeekPosition whence, GnomeVFS.FileOffset offset, GnomeVFS.AsyncSeekCallback callback, pointer callback_data);
+ public static void async_seek (GnomeVFS.AsyncHandle handle, GnomeVFS.SeekPosition whence, GnomeVFS.FileOffset offset, GnomeVFS.AsyncSeekCallback callback, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static void async_set_file_info (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.FileInfo info, GnomeVFS.SetFileInfoMask mask, GnomeVFS.FileInfoOptions options, int priority, GnomeVFS.AsyncSetFileInfoCallback callback, pointer callback_data);
+ public static void async_set_file_info (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.FileInfo info, GnomeVFS.SetFileInfoMask mask, GnomeVFS.FileInfoOptions options, int priority, GnomeVFS.AsyncSetFileInfoCallback callback, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static void async_set_job_limit (int limit);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static void async_write (GnomeVFS.AsyncHandle handle, pointer buffer, uint bytes, GnomeVFS.AsyncWriteCallback callback, pointer callback_data);
+ public static void async_write (GnomeVFS.AsyncHandle handle, void* buffer, uint bytes, GnomeVFS.AsyncWriteCallback callback, void* callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static GnomeVFS.Result async_xfer (out weak GnomeVFS.AsyncHandle handle_return, GLib.List source_uri_list, GLib.List target_uri_list, GnomeVFS.XferOptions xfer_options, GnomeVFS.XferErrorMode error_mode, GnomeVFS.XferOverwriteMode overwrite_mode, int priority, GnomeVFS.AsyncXferProgressCallback progress_update_callback, pointer update_callback_data, GnomeVFS.XferProgressCallback progress_sync_callback, pointer sync_callback_data);
+ public static GnomeVFS.Result async_xfer (out weak GnomeVFS.AsyncHandle handle_return, GLib.List source_uri_list, GLib.List target_uri_list, GnomeVFS.XferOptions xfer_options, GnomeVFS.XferErrorMode error_mode, GnomeVFS.XferOverwriteMode overwrite_mode, int priority, GnomeVFS.AsyncXferProgressCallback progress_update_callback, void* update_callback_data, GnomeVFS.XferProgressCallback progress_sync_callback, void* sync_callback_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static GnomeVFS.Result check_same_fs (string source, string target, bool same_fs_return);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
@@ -1056,15 +1056,15 @@
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static GnomeVFS.Result directory_read_next (GnomeVFS.DirectoryHandle handle, GnomeVFS.FileInfo file_info);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static GnomeVFS.Result directory_visit (string text_uri, GnomeVFS.FileInfoOptions info_options, GnomeVFS.DirectoryVisitOptions visit_options, GnomeVFS.DirectoryVisitFunc callback, pointer data);
+ public static GnomeVFS.Result directory_visit (string text_uri, GnomeVFS.FileInfoOptions info_options, GnomeVFS.DirectoryVisitOptions visit_options, GnomeVFS.DirectoryVisitFunc callback, void* data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static GnomeVFS.Result directory_visit_files (string text_uri, GLib.List file_list, GnomeVFS.FileInfoOptions info_options, GnomeVFS.DirectoryVisitOptions visit_options, GnomeVFS.DirectoryVisitFunc callback, pointer data);
+ public static GnomeVFS.Result directory_visit_files (string text_uri, GLib.List file_list, GnomeVFS.FileInfoOptions info_options, GnomeVFS.DirectoryVisitOptions visit_options, GnomeVFS.DirectoryVisitFunc callback, void* data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static GnomeVFS.Result directory_visit_files_at_uri (GnomeVFS.URI uri, GLib.List file_list, GnomeVFS.FileInfoOptions info_options, GnomeVFS.DirectoryVisitOptions visit_options, GnomeVFS.DirectoryVisitFunc callback, pointer data);
+ public static GnomeVFS.Result directory_visit_files_at_uri (GnomeVFS.URI uri, GLib.List file_list, GnomeVFS.FileInfoOptions info_options, GnomeVFS.DirectoryVisitOptions visit_options, GnomeVFS.DirectoryVisitFunc callback, void* data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static GnomeVFS.Result directory_visit_uri (GnomeVFS.URI uri, GnomeVFS.FileInfoOptions info_options, GnomeVFS.DirectoryVisitOptions visit_options, GnomeVFS.DirectoryVisitFunc callback, pointer data);
+ public static GnomeVFS.Result directory_visit_uri (GnomeVFS.URI uri, GnomeVFS.FileInfoOptions info_options, GnomeVFS.DirectoryVisitOptions visit_options, GnomeVFS.DirectoryVisitFunc callback, void* data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static GnomeVFS.Result dns_sd_browse (out weak GnomeVFS.DNSSDBrowseHandle handle, string domain, string type, GnomeVFS.DNSSDBrowseCallback callback, pointer callback_data, GLib.DestroyNotify callback_data_destroy_func);
+ public static GnomeVFS.Result dns_sd_browse (out weak GnomeVFS.DNSSDBrowseHandle handle, string domain, string type, GnomeVFS.DNSSDBrowseCallback callback, void* callback_data, GLib.DestroyNotify callback_data_destroy_func);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static GnomeVFS.Result dns_sd_browse_sync (string domain, string type, int timeout_msec, int n_services, out weak GnomeVFS.DNSSDService services);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
@@ -1072,7 +1072,7 @@
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static GnomeVFS.Result dns_sd_list_browse_domains_sync (string domain, int timeout_msec, GLib.List domains);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static GnomeVFS.Result dns_sd_resolve (out weak GnomeVFS.DNSSDResolveHandle handle, string name, string type, string domain, int timeout, GnomeVFS.DNSSDResolveCallback callback, pointer callback_data, GLib.DestroyNotify callback_data_destroy_func);
+ public static GnomeVFS.Result dns_sd_resolve (out weak GnomeVFS.DNSSDResolveHandle handle, string name, string type, string domain, int timeout, GnomeVFS.DNSSDResolveCallback callback, void* callback_data, GLib.DestroyNotify callback_data_destroy_func);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static GnomeVFS.Result dns_sd_resolve_sync (string name, string type, string domain, int timeout_msec, out weak string host, int port, GLib.HashTable text, int text_raw_len_out, out weak string text_raw_out);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
@@ -1090,7 +1090,7 @@
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static weak string expand_initial_tilde (string path);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static GnomeVFS.Result file_control (GnomeVFS.Handle handle, string operation, pointer operation_data);
+ public static GnomeVFS.Result file_control (GnomeVFS.Handle handle, string operation, void* operation_data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static GnomeVFS.Result find_directory (GnomeVFS.URI near_uri, GnomeVFS.FindDirectoryKind kind, out weak GnomeVFS.URI _result, bool create_if_needed, bool find_if_needed, uint permissions);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
@@ -1108,9 +1108,9 @@
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static GnomeVFS.Result get_file_info_uri (GnomeVFS.URI uri, GnomeVFS.FileInfo info, GnomeVFS.FileInfoOptions options);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static weak string get_file_mime_type (string path, pointer optional_stat_info, bool suffix_only);
+ public static weak string get_file_mime_type (string path, void* optional_stat_info, bool suffix_only);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static weak string get_file_mime_type_fast (string path, pointer optional_stat_info);
+ public static weak string get_file_mime_type_fast (string path, void* optional_stat_info);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static weak string get_local_path_from_uri (string uri);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
@@ -1118,11 +1118,11 @@
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static weak string get_mime_type_common (GnomeVFS.URI uri);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static weak string get_mime_type_for_data (pointer data, int data_size);
+ public static weak string get_mime_type_for_data (void* data, int data_size);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static weak string get_mime_type_for_name (string filename);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static weak string get_mime_type_for_name_and_data (string filename, pointer data, long data_size);
+ public static weak string get_mime_type_for_name_and_data (string filename, void* data, long data_size);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static weak string get_mime_type_from_file_data (GnomeVFS.URI uri);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
@@ -1152,7 +1152,7 @@
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static void list_deep_free (GLib.List list);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static void loadinit (pointer app, pointer modinfo);
+ public static void loadinit (void* app, void* modinfo);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static GnomeVFS.Result make_directory (string text_uri, uint perm);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
@@ -1202,7 +1202,7 @@
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static weak GnomeVFS.MimeApplication mime_get_default_application_for_uri (string uri, string mime_type);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static pointer mime_get_default_component (string mime_type);
+ public static void* mime_get_default_component (string mime_type);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static weak string mime_get_default_desktop_entry (string mime_type);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
@@ -1268,9 +1268,9 @@
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static void module_callback_pop (string callback_name);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static void module_callback_push (string callback_name, GnomeVFS.ModuleCallback callback, pointer callback_data, GLib.DestroyNotify destroy_notify);
+ public static void module_callback_push (string callback_name, GnomeVFS.ModuleCallback callback, void* callback_data, GLib.DestroyNotify destroy_notify);
[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);
+ public static void module_callback_set_default (string callback_name, GnomeVFS.ModuleCallback callback, void* 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);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
@@ -1286,11 +1286,11 @@
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static GnomeVFS.Result open_uri (out weak GnomeVFS.Handle handle, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static void postinit (pointer app, pointer modinfo);
+ public static void postinit (void* app, void* modinfo);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static void preinit (pointer app, pointer modinfo);
+ public static void preinit (void* app, void* modinfo);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static GnomeVFS.Result read (GnomeVFS.Handle handle, pointer buffer, GnomeVFS.FileSize bytes, GnomeVFS.FileSize bytes_read);
+ public static GnomeVFS.Result read (GnomeVFS.Handle handle, void* buffer, GnomeVFS.FileSize bytes, GnomeVFS.FileSize bytes_read);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static GnomeVFS.Result read_entire_file (string uri, int file_size, out weak string file_contents);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
@@ -1346,11 +1346,11 @@
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
public static GnomeVFS.Result url_show_with_env (string url, out weak string envp);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static GnomeVFS.Result write (GnomeVFS.Handle handle, pointer buffer, GnomeVFS.FileSize bytes, GnomeVFS.FileSize bytes_written);
+ public static GnomeVFS.Result write (GnomeVFS.Handle handle, void* buffer, GnomeVFS.FileSize bytes, GnomeVFS.FileSize bytes_written);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static GnomeVFS.Result xfer_delete_list (GLib.List source_uri_list, GnomeVFS.XferErrorMode error_mode, GnomeVFS.XferOptions xfer_options, GnomeVFS.XferProgressCallback progress_callback, pointer data);
+ public static GnomeVFS.Result xfer_delete_list (GLib.List source_uri_list, GnomeVFS.XferErrorMode error_mode, GnomeVFS.XferOptions xfer_options, GnomeVFS.XferProgressCallback progress_callback, void* data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static GnomeVFS.Result xfer_uri (GnomeVFS.URI source_uri, GnomeVFS.URI target_uri, GnomeVFS.XferOptions xfer_options, GnomeVFS.XferErrorMode error_mode, GnomeVFS.XferOverwriteMode overwrite_mode, GnomeVFS.XferProgressCallback progress_callback, pointer data);
+ public static GnomeVFS.Result xfer_uri (GnomeVFS.URI source_uri, GnomeVFS.URI target_uri, GnomeVFS.XferOptions xfer_options, GnomeVFS.XferErrorMode error_mode, GnomeVFS.XferOverwriteMode overwrite_mode, GnomeVFS.XferProgressCallback progress_callback, void* data);
[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
- public static GnomeVFS.Result xfer_uri_list (GLib.List source_uri_list, GLib.List target_uri_list, GnomeVFS.XferOptions xfer_options, GnomeVFS.XferErrorMode error_mode, GnomeVFS.XferOverwriteMode overwrite_mode, GnomeVFS.XferProgressCallback progress_callback, pointer data);
+ public static GnomeVFS.Result xfer_uri_list (GLib.List source_uri_list, GLib.List target_uri_list, GnomeVFS.XferOptions xfer_options, GnomeVFS.XferErrorMode error_mode, GnomeVFS.XferOverwriteMode overwrite_mode, GnomeVFS.XferProgressCallback progress_callback, void* data);
}
Modified: trunk/vapi/goocanvas.vapi
==============================================================================
--- trunk/vapi/goocanvas.vapi (original)
+++ trunk/vapi/goocanvas.vapi Sat Apr 19 16:06:52 2008
@@ -2,37 +2,37 @@
[CCode (cprefix = "Goo", lower_case_cprefix = "goo_")]
namespace Goo {
- [CCode (cprefix = "CAIRO_ANTIALIAS_", cheader_filename = "goocanvas.h")]
+ [CCode (cprefix = "CAIRO_ANTIALIAS_", has_type_id = "0", cheader_filename = "goocanvas.h")]
public enum CairoAntialias {
DEFAULT,
NONE,
GRAY,
- SUBPIXEL,
+ SUBPIXEL
}
- [CCode (cprefix = "CAIRO_FILL_RULE_", cheader_filename = "goocanvas.h")]
+ [CCode (cprefix = "CAIRO_FILL_RULE_", has_type_id = "0", cheader_filename = "goocanvas.h")]
public enum CairoFillRule {
WINDING,
- EVEN_ODD,
+ EVEN_ODD
}
- [CCode (cprefix = "CAIRO_HINT_METRICS_", cheader_filename = "goocanvas.h")]
+ [CCode (cprefix = "CAIRO_HINT_METRICS_", has_type_id = "0", cheader_filename = "goocanvas.h")]
public enum CairoHintMetrics {
DEFAULT,
OFF,
- ON,
+ ON
}
- [CCode (cprefix = "CAIRO_LINE_CAP_", cheader_filename = "goocanvas.h")]
+ [CCode (cprefix = "CAIRO_LINE_CAP_", has_type_id = "0", cheader_filename = "goocanvas.h")]
public enum CairoLineCap {
BUTT,
ROUND,
- SQUARE,
+ SQUARE
}
- [CCode (cprefix = "CAIRO_LINE_JOIN_", cheader_filename = "goocanvas.h")]
+ [CCode (cprefix = "CAIRO_LINE_JOIN_", has_type_id = "0", cheader_filename = "goocanvas.h")]
public enum CairoLineJoin {
MITER,
ROUND,
- BEVEL,
+ BEVEL
}
- [CCode (cprefix = "CAIRO_OPERATOR_", cheader_filename = "goocanvas.h")]
+ [CCode (cprefix = "CAIRO_OPERATOR_", has_type_id = "0", cheader_filename = "goocanvas.h")]
public enum CairoOperator {
CLEAR,
SOURCE,
@@ -47,23 +47,23 @@
DEST_ATOP,
XOR,
ADD,
- SATURATE,
+ SATURATE
}
- [CCode (cprefix = "GOO_CANVAS_ANIMATE_", cheader_filename = "goocanvas.h")]
+ [CCode (cprefix = "GOO_CANVAS_ANIMATE_", has_type_id = "0", cheader_filename = "goocanvas.h")]
public enum CanvasAnimateType {
FREEZE,
RESET,
RESTART,
- BOUNCE,
+ BOUNCE
}
- [CCode (cprefix = "GOO_CANVAS_ITEM_", cheader_filename = "goocanvas.h")]
+ [CCode (cprefix = "GOO_CANVAS_ITEM_", has_type_id = "0", cheader_filename = "goocanvas.h")]
public enum CanvasItemVisibility {
HIDDEN,
INVISIBLE,
VISIBLE,
- VISIBLE_ABOVE_THRESHOLD,
+ VISIBLE_ABOVE_THRESHOLD
}
- [CCode (cprefix = "GOO_CANVAS_PATH_", cheader_filename = "goocanvas.h")]
+ [CCode (cprefix = "GOO_CANVAS_PATH_", has_type_id = "0", cheader_filename = "goocanvas.h")]
public enum CanvasPathCommandType {
MOVE_TO,
CLOSE_PATH,
@@ -74,9 +74,9 @@
SMOOTH_CURVE_TO,
QUADRATIC_CURVE_TO,
SMOOTH_QUADRATIC_CURVE_TO,
- ELLIPTICAL_ARC,
+ ELLIPTICAL_ARC
}
- [CCode (cprefix = "GOO_CANVAS_EVENTS_", cheader_filename = "goocanvas.h")]
+ [CCode (cprefix = "GOO_CANVAS_EVENTS_", has_type_id = "0", cheader_filename = "goocanvas.h")]
[Flags]
public enum CanvasPointerEvents {
VISIBLE_MASK,
@@ -91,7 +91,7 @@
PAINTED,
FILL,
STROKE,
- ALL,
+ ALL
}
[CCode (cheader_filename = "goocanvas.h")]
public class CanvasEllipseData {
@@ -143,13 +143,13 @@
public double arrow_length;
public double arrow_tip_length;
[NoArrayLength]
- public weak double[] line_start;
+ public double[] line_start;
[NoArrayLength]
- public weak double[] line_end;
+ public double[] line_end;
[NoArrayLength]
- public weak double[] start_arrow_coords;
+ public double[] start_arrow_coords;
[NoArrayLength]
- public weak double[] end_arrow_coords;
+ public double[] end_arrow_coords;
}
[CCode (cheader_filename = "goocanvas.h")]
public class CanvasPolylineData {
@@ -180,7 +180,7 @@
public double width;
public double height;
[NoArrayLength]
- public weak Goo.CanvasTableDimension[] dimensions;
+ public Goo.CanvasTableDimension[] dimensions;
public double border_width;
public weak GLib.Array children;
public weak Goo.CanvasTableLayoutData layout_data;
@@ -275,10 +275,10 @@
public void grab_focus (Goo.CanvasItem item);
public Gdk.GrabStatus keyboard_grab (Goo.CanvasItem item, bool owner_events, uint time);
public void keyboard_ungrab (Goo.CanvasItem item, uint time);
- public static void marshal_BOOLEAN__BOXED (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
- public static void marshal_BOOLEAN__OBJECT_BOXED (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
- public static void marshal_VOID__INT_INT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
- public static void marshal_VOID__OBJECT_OBJECT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+ public static void marshal_BOOLEAN__BOXED (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ public static void marshal_BOOLEAN__OBJECT_BOXED (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ public static void marshal_VOID__INT_INT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+ public static void marshal_VOID__OBJECT_OBJECT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
public Canvas ();
public static weak GLib.Array parse_path_data (string path_data);
public Gdk.GrabStatus pointer_grab (Goo.CanvasItem item, Gdk.EventMask event_mask, Gdk.Cursor cursor, uint time);
@@ -720,9 +720,9 @@
}
[CCode (cheader_filename = "goocanvas.h")]
public class CanvasPathCommand {
- public pointer simple;
- public pointer curve;
- public pointer arc;
+ public void* simple;
+ public void* curve;
+ public void* arc;
}
[CCode (cheader_filename = "goocanvas.h")]
public interface CanvasItem : GLib.Object {
@@ -733,7 +733,7 @@
public void ensure_updated ();
public int find_child (Goo.CanvasItem child);
public void get_child_properties (Goo.CanvasItem child);
- public void get_child_properties_valist (Goo.CanvasItem child, pointer var_args);
+ public void get_child_properties_valist (Goo.CanvasItem child, void* var_args);
public bool is_container ();
public void lower (Goo.CanvasItem below);
public void raise (Goo.CanvasItem above);
@@ -741,7 +741,7 @@
public void rotate (double degrees, double cx, double cy);
public void scale (double sx, double sy);
public void set_child_properties (Goo.CanvasItem child);
- public void set_child_properties_valist (Goo.CanvasItem child, pointer var_args);
+ public void set_child_properties_valist (Goo.CanvasItem child, void* var_args);
public void set_simple_transform (double x, double y, double scale, double rotation);
public void skew_x (double degrees, double cx, double cy);
public void skew_y (double degrees, double cx, double cy);
@@ -767,7 +767,7 @@
public abstract void move_child (int old_position, int new_position);
public abstract void paint (Cairo.Context cr, Goo.CanvasBounds bounds, double scale);
[NoWrapper]
- public abstract bool query_tooltip (double x, double y, bool keyboard_tooltip, pointer tooltip);
+ public abstract bool query_tooltip (double x, double y, bool keyboard_tooltip, void* tooltip);
public abstract void remove_child (int child_num);
public abstract void request_update ();
public abstract void set_canvas (Goo.Canvas canvas);
@@ -806,7 +806,7 @@
public static weak GLib.ParamSpec class_list_child_properties (GLib.ObjectClass mclass, uint n_properties);
public int find_child (Goo.CanvasItemModel child);
public void get_child_properties (Goo.CanvasItemModel child);
- public void get_child_properties_valist (Goo.CanvasItemModel child, pointer var_args);
+ public void get_child_properties_valist (Goo.CanvasItemModel child, void* var_args);
public bool is_container ();
public void lower (Goo.CanvasItemModel below);
public void raise (Goo.CanvasItemModel above);
@@ -814,7 +814,7 @@
public void rotate (double degrees, double cx, double cy);
public void scale (double sx, double sy);
public void set_child_properties (Goo.CanvasItemModel child);
- public void set_child_properties_valist (Goo.CanvasItemModel child, pointer var_args);
+ public void set_child_properties_valist (Goo.CanvasItemModel child, void* var_args);
public void set_simple_transform (double x, double y, double scale, double rotation);
public void skew_x (double degrees, double cx, double cy);
public void skew_y (double degrees, double cx, double cy);
Modified: trunk/vapi/gstreamer-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-0.10.vapi (original)
+++ trunk/vapi/gstreamer-0.10.vapi Sat Apr 19 16:06:52 2008
@@ -522,8 +522,7 @@
public uint64 offset;
public uint64 offset_end;
public uchar malloc_data;
- [NoArrayLength]
- public pointer[] _gst_reserved;
+ public void* _gst_reserved;
public void copy_metadata (Gst.Buffer src, Gst.BufferCopyFlags flags);
public weak Gst.Buffer create_sub (uint offset, uint size);
public weak Gst.Caps get_caps ();
@@ -552,11 +551,11 @@
public weak Gst.ClockTime interval;
public Gst.ClockReturn status;
public Gst.ClockCallback func;
- public pointer user_data;
+ public void* user_data;
}
[CCode (ref_function = "gst_clock_id_ref", unref_function = "gst_clock_id_unref", cheader_filename = "gst/gst.h")]
public class ClockID {
- public static int compare_func (pointer id1, pointer id2);
+ public static int compare_func (void* id1, void* id2);
public weak Gst.ClockTime get_time ();
public void unschedule ();
public Gst.ClockReturn wait (Gst.ClockTimeDiff jitter);
@@ -591,8 +590,7 @@
public weak string klass;
public weak string description;
public weak string author;
- [NoArrayLength]
- public pointer[] _gst_reserved;
+ public void* _gst_reserved;
}
[CCode (cheader_filename = "gst/gst.h")]
public class Event {
@@ -601,7 +599,7 @@
public uint64 timestamp;
public weak Gst.Object src;
public weak Gst.Structure structure;
- public pointer _gst_reserved;
+ public void* _gst_reserved;
public weak Gst.Structure get_structure ();
public Event.buffer_size (Gst.Format format, int64 minsize, int64 maxsize, bool async);
public Event.custom (Gst.EventType type, Gst.Structure structure);
@@ -629,8 +627,7 @@
[CCode (cheader_filename = "gst/gst.h")]
public class EventClass {
public weak Gst.MiniObjectClass mini_object_class;
- [NoArrayLength]
- public pointer[] _gst_reserved;
+ public void* _gst_reserved;
}
[CCode (cheader_filename = "gst/gst.h")]
public class FormatDefinition {
@@ -662,14 +659,13 @@
public weak GLib.Mutex @lock;
public uint cookie;
public uint master_cookie;
- [NoArrayLength]
- public pointer[] _gst_reserved;
+ public void* _gst_reserved;
public weak Gst.Iterator filter (GLib.CompareFunc func);
- public pointer find_custom (GLib.CompareFunc func);
+ public void* 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 Iterator.list (GLib.Type type, GLib.Mutex @lock, uint master_cookie, GLib.List list, void* owner, Gst.IteratorItemFunction item, Gst.IteratorDisposeFunction free);
public void push (Gst.Iterator other);
}
[CCode (cheader_filename = "gst/gst.h")]
@@ -681,8 +677,7 @@
public uint64 timestamp;
public weak Gst.Object src;
public weak Gst.Structure structure;
- [NoArrayLength]
- public pointer[] _gst_reserved;
+ public void* _gst_reserved;
public weak Gst.Structure get_structure ();
public Message.application (Gst.Object src, Gst.Structure structure);
public Message.async_done (Gst.Object src);
@@ -723,15 +718,14 @@
[CCode (cheader_filename = "gst/gst.h")]
public class MessageClass {
public weak Gst.MiniObjectClass mini_object_class;
- [NoArrayLength]
- public pointer[] _gst_reserved;
+ public void* _gst_reserved;
}
[CCode (ref_function = "gst_mini_object_ref", unref_function = "gst_mini_object_unref", cheader_filename = "gst/gst.h")]
public class MiniObject {
public weak GLib.TypeInstance instance;
public int refcount;
public uint flags;
- public pointer _gst_reserved;
+ public void* _gst_reserved;
public weak Gst.MiniObject copy ();
public bool is_writable ();
public weak Gst.MiniObject make_writable ();
@@ -743,7 +737,7 @@
public weak GLib.TypeClass type_class;
public Gst.MiniObjectCopyFunction copy;
public Gst.MiniObjectFinalizeFunction finalize;
- public pointer _gst_reserved;
+ public void* _gst_reserved;
}
[CCode (cheader_filename = "gst/gst.h")]
public class ParamSpecFraction {
@@ -767,15 +761,14 @@
public weak string source;
public weak string package;
public weak string origin;
- [NoArrayLength]
- public pointer[] _gst_reserved;
+ public void* _gst_reserved;
}
[CCode (cheader_filename = "gst/gst.h")]
public class Query {
public weak Gst.MiniObject mini_object;
public Gst.QueryType type;
public weak Gst.Structure structure;
- public pointer _gst_reserved;
+ public void* _gst_reserved;
public weak Gst.Structure get_structure ();
public Query.application (Gst.QueryType type, Gst.Structure structure);
public Query.convert (Gst.Format src_format, int64 value, Gst.Format dest_format);
@@ -812,8 +805,7 @@
[CCode (cheader_filename = "gst/gst.h")]
public class QueryClass {
public weak Gst.MiniObjectClass mini_object_class;
- [NoArrayLength]
- public pointer[] _gst_reserved;
+ public void* _gst_reserved;
}
[CCode (cheader_filename = "gst/gst.h")]
public class QueryTypeDefinition {
@@ -825,9 +817,9 @@
[CCode (cheader_filename = "gst/gst.h")]
public class StaticCaps {
public weak Gst.Caps caps;
+ [CCode (cname = "string")]
public weak string str;
- [NoArrayLength]
- public pointer[] _gst_reserved;
+ public void* _gst_reserved;
public weak Gst.Caps get ();
}
[CCode (cheader_filename = "gst/gst.h")]
@@ -842,8 +834,8 @@
[CCode (copy_function = "gst_tag_list_copy", cheader_filename = "gst/gst.h")]
public class TagList : GLib.Boxed {
public void add (Gst.TagMergeMode mode, string tag);
- public void add_valist (Gst.TagMergeMode mode, string tag, pointer var_args);
- public void add_valist_values (Gst.TagMergeMode mode, string tag, pointer var_args);
+ public void add_valist (Gst.TagMergeMode mode, string tag, void* var_args);
+ public void add_valist_values (Gst.TagMergeMode mode, string tag, void* var_args);
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);
@@ -864,8 +856,8 @@
public bool get_int_index (string tag, uint index, int value);
public bool get_long (string tag, long value);
public bool get_long_index (string tag, uint index, long value);
- public bool get_pointer (string tag, pointer value);
- public bool get_pointer_index (string tag, uint index, pointer value);
+ public bool get_pointer (string tag, void* value);
+ public bool get_pointer_index (string tag, uint index, void* value);
public bool get_string (string tag, string value);
public bool get_string_index (string tag, uint index, string value);
public uint get_tag_size (string tag);
@@ -907,15 +899,14 @@
}
[CCode (cheader_filename = "gst/gst.h")]
public class TypeFind {
- public pointer data;
- [NoArrayLength]
- public pointer[] _gst_reserved;
+ public void* data;
+ public void* _gst_reserved;
[CCode (cname = "gst_type_find_get_length")]
public uint64 get_length ();
[CCode (cname = "gst_type_find_peek")]
public uchar peek (int64 offset, uint size);
[CCode (cname = "gst_type_find_register")]
- public static bool register (Gst.Plugin plugin, string name, uint rank, Gst.TypeFindFunction func, string extensions, Gst.Caps possible_caps, pointer data, GLib.DestroyNotify data_notify);
+ public static bool register (Gst.Plugin plugin, string name, uint rank, Gst.TypeFindFunction func, string extensions, Gst.Caps possible_caps, void* data, GLib.DestroyNotify data_notify);
[CCode (cname = "gst_type_find_suggest")]
public void suggest (uint probability, Gst.Caps caps);
}
@@ -930,8 +921,7 @@
public Gst.ValueCompareFunc compare;
public Gst.ValueSerializeFunc serialize;
public Gst.ValueDeserializeFunc deserialize;
- [NoArrayLength]
- public pointer[] _gst_reserved;
+ public void* _gst_reserved;
}
[CCode (ref_function = "gst_caps_ref", unref_function = "gst_caps_unref", cheader_filename = "gst/gst.h")]
public class Caps : GLib.Boxed {
@@ -939,8 +929,7 @@
public int refcount;
public Gst.CapsFlags flags;
public weak GLib.PtrArray structs;
- [NoArrayLength]
- public pointer[] _gst_reserved;
+ public void* _gst_reserved;
public void append (Gst.Caps caps2);
public void append_structure (Gst.Structure structure);
public weak Gst.Caps copy ();
@@ -957,21 +946,21 @@
public bool is_equal_fixed (Gst.Caps caps2);
public bool is_fixed ();
public bool is_subset (Gst.Caps superset);
- public static weak Gst.Caps load_thyself (pointer parent);
+ public static weak Gst.Caps load_thyself (void* parent);
public weak Gst.Caps make_writable ();
public void merge (Gst.Caps caps2);
public void merge_structure (Gst.Structure structure);
public Caps.any ();
public Caps.empty ();
public Caps.full (Gst.Structure struct1, ...);
- public Caps.full_valist (Gst.Structure structure, pointer var_args);
+ public Caps.full_valist (Gst.Structure structure, void* var_args);
public Caps.simple (string media_type, string fieldname, ...);
public weak Gst.Caps normalize ();
public void remove_structure (uint idx);
public void replace (Gst.Caps newcaps);
- public pointer save_thyself (pointer parent);
+ public void* save_thyself (void* parent);
public void set_simple (string field, ...);
- public void set_simple_valist (string field, pointer varargs);
+ public void set_simple_valist (string field, void* varargs);
public weak Gst.Caps subtract (Gst.Caps subtrahend);
public weak string to_string ();
public void truncate ();
@@ -987,7 +976,7 @@
public class IndexEntry : GLib.Boxed {
public Gst.IndexEntryType type;
public int id;
- public pointer data;
+ public void* data;
public bool assoc_map (Gst.Format format, int64 value);
public weak Gst.IndexEntry copy ();
}
@@ -1023,7 +1012,7 @@
public GLib.Quark name;
public int parent_refcount;
public weak GLib.Array fields;
- public pointer _gst_reserved;
+ public void* _gst_reserved;
public weak Gst.Structure copy ();
public static weak Gst.Structure empty_new (string name);
public bool fixate_field_boolean (string field_name, bool target);
@@ -1052,21 +1041,21 @@
public static weak Gst.Structure id_empty_new (GLib.Quark quark);
public GLib.Value id_get_value (GLib.Quark field);
public void id_set (GLib.Quark fieldname, ...);
- public void id_set_valist (GLib.Quark fieldname, pointer varargs);
+ public void id_set_valist (GLib.Quark fieldname, void* varargs);
public void id_set_value (GLib.Quark field, GLib.Value value);
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);
+ public Structure.valist (string name, string firstfield, void* varargs);
public weak string nth_field_name (uint index);
public void remove_all_fields ();
public void remove_field (string fieldname);
public void remove_fields (string fieldname, ...);
- public void remove_fields_valist (string fieldname, pointer varargs);
+ public void remove_fields_valist (string fieldname, void* varargs);
public void set (string fieldname, ...);
public void set_name (string name);
public void set_parent_refcount (int refcount);
- public void set_valist (string fieldname, pointer varargs);
+ public void set_valist (string fieldname, void* varargs);
public void set_value (string fieldname, GLib.Value value);
public weak string to_string ();
}
@@ -1113,14 +1102,14 @@
public weak GLib.Queue queue;
public weak GLib.Mutex queue_lock;
public Gst.BusSyncHandler sync_handler;
- public pointer sync_handler_data;
+ public void* sync_handler_data;
public uint signal_watch_id;
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);
public uint add_watch_full (int priority, Gst.BusFunc func, GLib.DestroyNotify notify);
- public bool async_signal_func (Gst.Message message, pointer data);
+ public bool async_signal_func (Gst.Message message, void* data);
public weak GLib.TimeoutSource create_watch ();
public void disable_sync_message_emission ();
public void enable_sync_message_emission ();
@@ -1133,8 +1122,8 @@
public bool post (Gst.Message message);
public void remove_signal_watch ();
public void set_flushing (bool flushing);
- public void set_sync_handler (Gst.BusSyncHandler func, pointer data);
- public Gst.BusSyncReply sync_signal_handler (Gst.Message message, pointer data);
+ public void set_sync_handler (Gst.BusSyncHandler func, void* data);
+ public Gst.BusSyncReply sync_signal_handler (Gst.Message message, void* data);
public weak Gst.Message timed_pop (Gst.ClockTime timeout);
public weak Gst.Message timed_pop_filtered (Gst.ClockTime timeout, Gst.MessageType types);
public signal void message (Gst.Message message);
@@ -1190,7 +1179,7 @@
}
[CCode (cheader_filename = "gst/gst.h")]
public class Element : Gst.Object {
- public pointer state_lock;
+ public void* state_lock;
public weak GLib.Cond state_cond;
public uint state_cookie;
public Gst.State current_state;
@@ -1207,15 +1196,15 @@
public ushort numsinkpads;
public weak GLib.List sinkpads;
public uint pads_cookie;
- public pointer abidata;
+ public void* abidata;
public void abort_state ();
public bool add_pad (Gst.Pad pad);
- public static void class_add_pad_template (pointer klass, Gst.PadTemplate templ);
- public static weak Gst.PadTemplate class_get_pad_template (pointer element_class, string name);
- public static weak GLib.List class_get_pad_template_list (pointer element_class);
- public static void class_install_std_props (pointer klass, ...);
- public static void class_set_details (pointer klass, Gst.ElementDetails details);
- public static void class_set_details_simple (pointer klass, string longname, string classification, string description, string author);
+ public static void class_add_pad_template (void* klass, Gst.PadTemplate templ);
+ public static weak Gst.PadTemplate class_get_pad_template (void* element_class, string name);
+ public static weak GLib.List class_get_pad_template_list (void* element_class);
+ public static void class_install_std_props (void* klass, ...);
+ public static void class_set_details (void* klass, Gst.ElementDetails details);
+ public static void class_set_details_simple (void* klass, string longname, string classification, string description, string author);
public Gst.StateChangeReturn continue_state (Gst.StateChangeReturn ret);
public void create_all_pads ();
public void found_tags (Gst.TagList list);
@@ -1322,9 +1311,9 @@
public weak Gst.IndexGroup curgroup;
public int maxgroup;
public Gst.IndexResolverMethod method;
- public pointer resolver_user_data;
+ public void* resolver_user_data;
public Gst.IndexFilter filter;
- public pointer filter_user_data;
+ public void* filter_user_data;
public GLib.DestroyNotify filter_user_data_destroy;
public weak GLib.HashTable writers;
public int last_id;
@@ -1332,7 +1321,7 @@
public weak Gst.IndexEntry add_associationv (int id, Gst.AssocFlags flags, int n, Gst.IndexAssociation list);
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 add_object (int id, string key, GLib.Type type, void* 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);
public Gst.IndexCertainty get_certainty ();
public int get_group ();
@@ -1377,33 +1366,33 @@
public weak Gst.Object get_parent ();
public weak string get_path_string ();
public bool has_ancestor (Gst.Object ancestor);
- public static pointer @ref (pointer object);
+ public static void* @ref (void* object);
public void replace (Gst.Object newobj);
public bool set_name (string name);
public void set_name_prefix (string name_prefix);
public bool set_parent (Gst.Object parent);
- public static void sink (pointer object);
+ public static void sink (void* object);
public void unparent ();
- public static void unref (pointer object);
- public virtual void restore_thyself (pointer self);
- public virtual pointer save_thyself (pointer parent);
+ public static void unref (void* object);
+ public virtual void restore_thyself (void* self);
+ public virtual void* save_thyself (void* parent);
public weak string name { get; set construct; }
public signal void deep_notify (Gst.Object orig, GLib.ParamSpec pspec);
- public signal void object_saved (pointer parent);
+ public signal void object_saved (void* parent);
public signal void parent_set (Gst.Object parent);
public signal void parent_unset (Gst.Object parent);
}
[CCode (cheader_filename = "gst/gst.h")]
public class Pad : Gst.Object {
- public pointer element_private;
+ public void* element_private;
public weak Gst.PadTemplate padtemplate;
- public pointer stream_rec_lock;
+ public void* stream_rec_lock;
public weak Gst.Task task;
public weak GLib.Mutex preroll_lock;
public weak GLib.Cond preroll_cond;
public weak GLib.Cond block_cond;
public Gst.PadBlockCallback block_callback;
- public pointer block_data;
+ public void* block_data;
public Gst.PadGetCapsFunction getcapsfunc;
public Gst.PadSetCapsFunction setcapsfunc;
public Gst.PadAcceptCapsFunction acceptcapsfunc;
@@ -1414,7 +1403,7 @@
public Gst.PadLinkFunction linkfunc;
public Gst.PadUnlinkFunction unlinkfunc;
public weak Gst.Pad peer;
- public pointer sched_private;
+ public void* sched_private;
public Gst.PadChainFunction chainfunc;
public Gst.PadCheckGetRangeFunction checkgetrangefunc;
public Gst.PadGetRangeFunction getrangefunc;
@@ -1428,21 +1417,21 @@
public bool accept_caps (Gst.Caps caps);
public bool activate_pull (bool active);
public bool activate_push (bool active);
- public ulong add_buffer_probe (GLib.Callback handler, pointer data);
- public ulong add_data_probe (GLib.Callback handler, pointer data);
- public ulong add_event_probe (GLib.Callback handler, pointer data);
+ public ulong add_buffer_probe (GLib.Callback handler, void* data);
+ public ulong add_data_probe (GLib.Callback handler, void* data);
+ public ulong add_event_probe (GLib.Callback handler, void* data);
public Gst.FlowReturn alloc_buffer (uint64 offset, int size, Gst.Caps caps, out weak Gst.Buffer buf);
public Gst.FlowReturn alloc_buffer_and_set_caps (uint64 offset, int size, Gst.Caps caps, out weak Gst.Buffer buf);
public bool can_link (Gst.Pad sinkpad);
public Gst.FlowReturn chain (Gst.Buffer buffer);
public bool check_pull_range ();
- public bool dispatcher (Gst.PadDispatcherFunction dispatch, pointer data);
+ public bool dispatcher (Gst.PadDispatcherFunction dispatch, void* data);
public bool event_default (Gst.Event event);
public void fixate_caps (Gst.Caps caps);
public weak Gst.Caps get_allowed_caps ();
public weak Gst.Caps get_caps ();
public Gst.PadDirection get_direction ();
- public pointer get_element_private ();
+ public void* get_element_private ();
public weak Gst.Caps get_fixed_caps_func ();
public weak GLib.List get_internal_links ();
public weak GLib.List get_internal_links_default ();
@@ -1495,7 +1484,7 @@
public bool set_caps (Gst.Caps caps);
public void set_chain_function (Gst.PadChainFunction chain);
public void set_checkgetrange_function (Gst.PadCheckGetRangeFunction check);
- public void set_element_private (pointer priv);
+ public void set_element_private (void* priv);
public void set_event_function (Gst.PadEventFunction event);
public void set_fixatecaps_function (Gst.PadFixateCapsFunction fixatecaps);
public void set_getcaps_function (Gst.PadGetCapsFunction getcaps);
@@ -1505,7 +1494,7 @@
public void set_query_function (Gst.PadQueryFunction query);
public void set_setcaps_function (Gst.PadSetCapsFunction setcaps);
public void set_unlink_function (Gst.PadUnlinkFunction unlink);
- public bool start_task (Gst.TaskFunction func, pointer data);
+ public bool start_task (Gst.TaskFunction func, void* data);
public bool stop_task ();
public bool unlink (Gst.Pad sinkpad);
public void use_fixed_caps ();
@@ -1621,8 +1610,8 @@
public bool scan_path (string path);
public bool xml_read_cache (string location);
public bool xml_write_cache (string location);
- public signal void feature_added (pointer feature);
- public signal void plugin_added (pointer plugin);
+ public signal void feature_added (void* feature);
+ public signal void plugin_added (void* plugin);
}
[CCode (cheader_filename = "gst/gst.h")]
public class SystemClock : Gst.Clock {
@@ -1634,17 +1623,17 @@
public class Task : Gst.Object {
public Gst.TaskState state;
public weak GLib.Cond cond;
- public pointer @lock;
+ public void* @lock;
public Gst.TaskFunction func;
- public pointer data;
+ public void* data;
public bool running;
- public pointer abidata;
+ public void* abidata;
public static void cleanup_all ();
- public static weak Gst.Task create (Gst.TaskFunction func, pointer data);
+ public static weak Gst.Task create (Gst.TaskFunction func, void* data);
public Gst.TaskState get_state ();
public bool join ();
public bool pause ();
- public void set_lock (pointer mutex);
+ public void set_lock (void* mutex);
public bool start ();
public bool stop ();
}
@@ -1653,7 +1642,7 @@
public Gst.TypeFindFunction function;
public weak string extensions;
public weak Gst.Caps caps;
- public pointer user_data;
+ public void* user_data;
public GLib.DestroyNotify user_data_notify;
[CCode (cname = "gst_type_find_factory_call_function")]
public void call_function (Gst.TypeFind find);
@@ -1667,30 +1656,30 @@
[CCode (cheader_filename = "gst/gst.h")]
public class XML : Gst.Object {
public weak GLib.List topelements;
- public pointer ns;
+ public void* ns;
public weak Gst.Element get_element (uchar[] name);
public weak GLib.List get_topelements ();
- public static weak Gst.Element make_element (pointer cur, Gst.Object parent);
+ public static weak Gst.Element make_element (void* cur, Gst.Object parent);
public XML ();
- public bool parse_doc (pointer doc, uchar[] root);
+ public bool parse_doc (void* doc, uchar[] root);
public bool parse_file (uchar[] fname, uchar[] root);
public bool parse_memory (uchar[] buffer, uint size, string root);
- public static pointer write (Gst.Element element);
+ public static void* write (Gst.Element element);
public static int write_file (Gst.Element element, GLib.FileStream @out);
[NoWrapper]
- public virtual void object_saved (Gst.Object object, pointer self);
- public signal void object_loaded (Gst.Object object, pointer self);
+ public virtual void object_saved (Gst.Object object, void* self);
+ public signal void object_loaded (Gst.Object object, void* self);
}
[CCode (cheader_filename = "gst/gst.h")]
public interface ChildProxy : Gst.Object {
public static void get (Gst.Object object, ...);
public weak Gst.Object get_child_by_name (string name);
public static void get_property (Gst.Object object, string name, GLib.Value value);
- public static void get_valist (Gst.Object object, string first_property_name, pointer var_args);
+ public static void get_valist (Gst.Object object, string first_property_name, void* var_args);
public static bool lookup (Gst.Object object, string name, out weak Gst.Object target, out weak GLib.ParamSpec pspec);
public static void set (Gst.Object object, ...);
public static void set_property (Gst.Object object, string name, GLib.Value value);
- public static void set_valist (Gst.Object object, string first_property_name, pointer var_args);
+ public static void set_valist (Gst.Object object, string first_property_name, void* var_args);
public abstract weak Gst.Object get_child_by_index (uint index);
public abstract uint get_children_count ();
[HasEmitter]
@@ -1700,8 +1689,8 @@
}
[CCode (cheader_filename = "gst/gst.h")]
public interface ImplementsInterface : Gst.Element {
- public static pointer cast (pointer from, GLib.Type type);
- public static bool check (pointer from, GLib.Type type);
+ public static void* cast (void* from, GLib.Type type);
+ public static bool check (void* from, GLib.Type type);
[NoWrapper]
public abstract bool supported (GLib.Type iface_type);
}
@@ -1729,21 +1718,21 @@
[CCode (cheader_filename = "gst/gst.h")]
public static delegate void DebugFuncPtr ();
[CCode (cheader_filename = "gst/gst.h")]
- public delegate bool FilterFunc (pointer obj);
+ public delegate bool FilterFunc (void* obj);
[CCode (cheader_filename = "gst/gst.h")]
public delegate bool IndexFilter (Gst.Index index, Gst.IndexEntry entry);
[CCode (cheader_filename = "gst/gst.h")]
public delegate bool IndexResolver (Gst.Index index, Gst.Object writer, string writer_string);
[CCode (cheader_filename = "gst/gst.h")]
- public static delegate void IteratorDisposeFunction (pointer owner);
+ public static delegate void IteratorDisposeFunction (void* owner);
[CCode (cheader_filename = "gst/gst.h")]
- public delegate bool IteratorFoldFunction (pointer item, GLib.Value ret);
+ public delegate bool IteratorFoldFunction (void* item, GLib.Value ret);
[CCode (cheader_filename = "gst/gst.h")]
public static delegate void IteratorFreeFunction (Gst.Iterator it);
[CCode (cheader_filename = "gst/gst.h")]
- public static delegate Gst.IteratorItem IteratorItemFunction (Gst.Iterator it, pointer item);
+ public static delegate Gst.IteratorItem IteratorItemFunction (Gst.Iterator it, void* item);
[CCode (cheader_filename = "gst/gst.h")]
- public static delegate Gst.IteratorResult IteratorNextFunction (Gst.Iterator it, pointer result);
+ public static delegate Gst.IteratorResult IteratorNextFunction (Gst.Iterator it, void* result);
[CCode (cheader_filename = "gst/gst.h")]
public static delegate void IteratorResyncFunction (Gst.Iterator it);
[CCode (cheader_filename = "gst/gst.h")]
@@ -1897,13 +1886,13 @@
[CCode (cheader_filename = "gst/gst.h")]
public static void atomic_int_set (int atomic_int, int value);
[CCode (cheader_filename = "gst/gst.h")]
- public static uint class_signal_connect (pointer klass, string name, pointer func, pointer func_data);
+ public static uint class_signal_connect (void* klass, string name, void* func, void* func_data);
[CCode (cheader_filename = "gst/gst.h")]
- public static void class_signal_emit_by_name (Gst.Object object, string name, pointer self);
+ public static void class_signal_emit_by_name (Gst.Object object, string name, void* self);
[CCode (cheader_filename = "gst/gst.h")]
public static GLib.Quark core_error_quark ();
[CCode (cheader_filename = "gst/gst.h")]
- public static void debug_add_log_function (Gst.LogFunction func, pointer data);
+ public static void debug_add_log_function (Gst.LogFunction func, void* data);
[CCode (cheader_filename = "gst/gst.h")]
public static weak string debug_construct_term_color (uint colorinfo);
[CCode (cheader_filename = "gst/gst.h")]
@@ -1919,15 +1908,15 @@
[CCode (cheader_filename = "gst/gst.h")]
public static void debug_log (Gst.DebugCategory category, Gst.DebugLevel level, string file, string function, int line, GLib.Object object, string format);
[CCode (cheader_filename = "gst/gst.h")]
- public static void debug_log_default (Gst.DebugCategory category, Gst.DebugLevel level, string file, string function, int line, GLib.Object object, Gst.DebugMessage message, pointer unused);
+ public static void debug_log_default (Gst.DebugCategory category, Gst.DebugLevel level, string file, string function, int line, GLib.Object object, Gst.DebugMessage message, void* unused);
[CCode (cheader_filename = "gst/gst.h")]
- public static void debug_log_valist (Gst.DebugCategory category, Gst.DebugLevel level, string file, string function, int line, GLib.Object object, string format, pointer args);
+ public static void debug_log_valist (Gst.DebugCategory category, Gst.DebugLevel level, string file, string function, int line, GLib.Object object, string format, void* args);
[CCode (cheader_filename = "gst/gst.h")]
public static void debug_print_stack_trace ();
[CCode (cheader_filename = "gst/gst.h")]
public static uint debug_remove_log_function (Gst.LogFunction func);
[CCode (cheader_filename = "gst/gst.h")]
- public static uint debug_remove_log_function_by_data (pointer data);
+ public static uint debug_remove_log_function_by_data (void* data);
[CCode (cheader_filename = "gst/gst.h")]
public static void debug_set_active (bool active);
[CCode (cheader_filename = "gst/gst.h")]
@@ -1979,41 +1968,41 @@
[CCode (cheader_filename = "gst/gst.h")]
public static GLib.Type int_range_get_type ();
[CCode (cheader_filename = "gst/gst.h")]
- public static bool is_tag_list (pointer p);
+ public static bool is_tag_list (void* p);
[CCode (cheader_filename = "gst/gst.h")]
public static GLib.Quark library_error_quark ();
[CCode (cheader_filename = "gst/gst.h")]
- public static void marshal_BOOLEAN__POINTER (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+ public static void marshal_BOOLEAN__POINTER (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "gst/gst.h")]
- public static void marshal_BOOLEAN__VOID (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+ public static void marshal_BOOLEAN__VOID (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "gst/gst.h")]
- public static void marshal_BOXED__BOXED (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+ public static void marshal_BOXED__BOXED (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "gst/gst.h")]
- public static void marshal_POINTER__POINTER (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+ public static void marshal_POINTER__POINTER (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "gst/gst.h")]
- public static void marshal_VOID__BOXED_OBJECT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+ public static void marshal_VOID__BOXED_OBJECT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "gst/gst.h")]
- public static void marshal_VOID__INT64 (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+ public static void marshal_VOID__INT64 (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "gst/gst.h")]
- public static void marshal_VOID__INT_INT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+ public static void marshal_VOID__INT_INT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "gst/gst.h")]
- public static void marshal_VOID__OBJECT_BOXED (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+ public static void marshal_VOID__OBJECT_BOXED (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "gst/gst.h")]
- public static void marshal_VOID__OBJECT_BOXED_STRING (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+ public static void marshal_VOID__OBJECT_BOXED_STRING (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "gst/gst.h")]
- public static void marshal_VOID__OBJECT_OBJECT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+ public static void marshal_VOID__OBJECT_OBJECT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "gst/gst.h")]
- public static void marshal_VOID__OBJECT_OBJECT_STRING (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+ public static void marshal_VOID__OBJECT_OBJECT_STRING (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "gst/gst.h")]
- public static void marshal_VOID__OBJECT_PARAM (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+ public static void marshal_VOID__OBJECT_PARAM (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "gst/gst.h")]
- public static void marshal_VOID__OBJECT_POINTER (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+ public static void marshal_VOID__OBJECT_POINTER (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "gst/gst.h")]
- public static void marshal_VOID__OBJECT_STRING (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+ public static void marshal_VOID__OBJECT_STRING (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "gst/gst.h")]
- public static void marshal_VOID__POINTER_OBJECT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+ public static void marshal_VOID__POINTER_OBJECT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "gst/gst.h")]
- public static void marshal_VOID__UINT_BOXED (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+ public static void marshal_VOID__UINT_BOXED (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "gst/gst.h")]
public static weak GLib.ParamSpec param_spec_fraction (string name, string nick, string blurb, int min_num, int min_denom, int max_num, int max_denom, int default_num, int default_denom, GLib.ParamFlags flags);
[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 Apr 19 16:06:52 2008
@@ -2,7 +2,7 @@
[CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
namespace Gst {
- [CCode (cprefix = "GST_AUDIO_CHANNEL_POSITION_", cheader_filename = "gst/audio/multichannel.h")]
+ [CCode (cprefix = "GST_AUDIO_CHANNEL_POSITION_", has_type_id = "0", cheader_filename = "gst/audio/multichannel.h")]
public enum AudioChannelPosition {
INVALID,
FRONT_MONO,
@@ -18,24 +18,24 @@
SIDE_LEFT,
SIDE_RIGHT,
NONE,
- NUM,
+ NUM
}
- [CCode (cprefix = "GST_AUDIO_FIELD_", cheader_filename = "gst/audio/audio.h")]
+ [CCode (cprefix = "GST_AUDIO_FIELD_", has_type_id = "0", cheader_filename = "gst/audio/audio.h")]
public enum AudioFieldFlag {
RATE,
CHANNELS,
ENDIANNESS,
WIDTH,
DEPTH,
- SIGNED,
+ SIGNED
}
- [CCode (cprefix = "GST_BASE_AUDIO_SINK_SLAVE_", cheader_filename = "gst/audio/gstbaseaudiosink.h")]
+ [CCode (cprefix = "GST_BASE_AUDIO_SINK_SLAVE_", has_type_id = "0", cheader_filename = "gst/audio/gstbaseaudiosink.h")]
public enum BaseAudioSinkSlaveMethod {
RESAMPLE,
SKEW,
- NONE,
+ NONE
}
- [CCode (cprefix = "GST_", cheader_filename = "gst/audio/gstringbuffer.h")]
+ [CCode (cprefix = "GST_", has_type_id = "0", cheader_filename = "gst/audio/gstringbuffer.h")]
public enum BufferFormat {
UNKNOWN,
S8,
@@ -72,9 +72,9 @@
A_LAW,
IMA_ADPCM,
MPEG,
- GSM,
+ GSM
}
- [CCode (cprefix = "GST_BUFTYPE_", cheader_filename = "gst/audio/gstringbuffer.h")]
+ [CCode (cprefix = "GST_BUFTYPE_", has_type_id = "0", cheader_filename = "gst/audio/gstringbuffer.h")]
public enum BufferFormatType {
LINEAR,
FLOAT,
@@ -82,20 +82,20 @@
A_LAW,
IMA_ADPCM,
MPEG,
- GSM,
+ GSM
}
- [CCode (cprefix = "GST_SEGSTATE_", cheader_filename = "gst/audio/gstringbuffer.h")]
+ [CCode (cprefix = "GST_SEGSTATE_", has_type_id = "0", cheader_filename = "gst/audio/gstringbuffer.h")]
public enum RingBufferSegState {
INVALID,
EMPTY,
FILLED,
- PARTIAL,
+ PARTIAL
}
- [CCode (cprefix = "GST_RING_BUFFER_STATE_", cheader_filename = "gst/audio/gstringbuffer.h")]
+ [CCode (cprefix = "GST_RING_BUFFER_STATE_", has_type_id = "0", cheader_filename = "gst/audio/gstringbuffer.h")]
public enum RingBufferState {
STOPPED,
PAUSED,
- STARTED,
+ STARTED
}
[CCode (cheader_filename = "gst/audio/gstaudiofilter.h")]
public class RingBufferSpec {
@@ -114,21 +114,20 @@
public int segtotal;
public int bytes_per_sample;
[NoArrayLength]
- public weak uchar[] silence_sample;
- [NoArrayLength]
- public weak pointer[] _gst_reserved;
+ public uchar[] silence_sample;
+ public void* _gst_reserved;
}
[CCode (cheader_filename = "gst/audio/gstaudioclock.h")]
public class AudioClock : Gst.SystemClock {
public Gst.AudioClockGetTimeFunc func;
- public pointer user_data;
+ public void* user_data;
public weak Gst.ClockTime last_time;
public AudioClock (string name, Gst.AudioClockGetTimeFunc func);
}
[CCode (cheader_filename = "gst/audio/gstaudiofilter.h")]
public class AudioFilter : Gst.BaseTransform {
public weak Gst.RingBufferSpec format;
- public static void class_add_pad_templates (pointer klass, Gst.Caps allowed_caps);
+ public static void class_add_pad_templates (void* klass, Gst.Caps allowed_caps);
[NoWrapper]
public virtual bool setup (Gst.RingBufferSpec format);
}
@@ -148,7 +147,7 @@
[NoWrapper]
public virtual bool unprepare ();
[NoWrapper]
- public virtual uint write (pointer data, uint length);
+ public virtual uint write (void* data, uint length);
}
[CCode (cheader_filename = "gst/audio/gstaudiosrc.h")]
public class AudioSrc : Gst.BaseAudioSrc {
@@ -162,7 +161,7 @@
[NoWrapper]
public virtual bool prepare (Gst.RingBufferSpec spec);
[NoWrapper]
- public virtual uint read (pointer data, uint length);
+ public virtual uint read (void* data, uint length);
[NoWrapper]
public virtual void reset ();
[NoWrapper]
@@ -214,8 +213,8 @@
public int segbase;
public int waiting;
public Gst.RingBufferCallback callback;
- public pointer cb_data;
- public pointer abidata;
+ public void* cb_data;
+ public void* abidata;
public void advance (uint advance);
public void clear (int segment);
public void clear_all ();
Modified: trunk/vapi/gstreamer-base-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-base-0.10.vapi (original)
+++ trunk/vapi/gstreamer-base-0.10.vapi Sat Apr 19 16:06:52 2008
@@ -2,10 +2,10 @@
[CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
namespace Gst {
- [CCode (cprefix = "GST_BASE_SRC_", cheader_filename = "gst/gst.h")]
+ [CCode (cprefix = "GST_BASE_SRC_", has_type_id = "0", cheader_filename = "gst/gst.h")]
public enum BaseSrcFlags {
STARTED,
- FLAG_LAST,
+ FLAG_LAST
}
[CCode (cheader_filename = "gst/base/gstcollectpads.h")]
public class CollectData {
@@ -14,7 +14,7 @@
public weak Gst.Buffer buffer;
public uint pos;
public weak Gst.Segment segment;
- public pointer abidata;
+ public void* abidata;
}
[CCode (cheader_filename = "gst/base/gstdataqueue.h")]
public class DataQueueItem {
@@ -72,7 +72,7 @@
public weak Gst.ClockID clock_id;
public weak Gst.ClockTime end_time;
public bool flushing;
- public pointer abidata;
+ public void* abidata;
public weak Gst.Buffer get_last_buffer ();
public weak Gst.ClockTime get_latency ();
public int64 get_max_lateness ();
@@ -144,7 +144,7 @@
public uint64 offset;
public uint64 size;
public int num_buffers_left;
- public pointer data;
+ public void* data;
public bool get_do_timestamp ();
public bool is_live ();
public bool query_latency (bool live, Gst.ClockTime min_latency, Gst.ClockTime max_latency);
@@ -255,12 +255,12 @@
public uint cookie;
public weak GLib.Cond cond;
public Gst.CollectPadsFunction func;
- public pointer user_data;
+ public void* user_data;
public uint numpads;
public uint queuedpads;
public uint eospads;
public bool started;
- public pointer abidata;
+ public void* abidata;
public weak Gst.CollectData add_pad (Gst.Pad pad, uint size);
public weak Gst.CollectData add_pad_full (Gst.Pad pad, uint size, Gst.CollectDataDestroyNotify destroy_notify);
public uint available ();
@@ -283,7 +283,7 @@
public weak GLib.Queue queue;
public weak Gst.DataQueueSize cur_level;
public Gst.DataQueueCheckFullFunction checkfull;
- public pointer checkdata;
+ public void* checkdata;
public weak GLib.Mutex qlock;
public weak GLib.Cond item_add;
public weak GLib.Cond item_del;
@@ -294,7 +294,7 @@
public bool is_empty ();
public bool is_full ();
public void limits_changed ();
- public DataQueue (Gst.DataQueueCheckFullFunction checkfull, pointer checkdata);
+ public DataQueue (Gst.DataQueueCheckFullFunction checkfull, void* checkdata);
public bool pop (out weak Gst.DataQueueItem item);
public bool push (Gst.DataQueueItem item);
public void set_flushing (bool flushing);
@@ -317,7 +317,7 @@
[CCode (cheader_filename = "gst/gst.h")]
public delegate Gst.FlowReturn CollectPadsFunction (Gst.CollectPads pads);
[CCode (cheader_filename = "gst/base/gstdataqueue.h")]
- public static delegate bool DataQueueCheckFullFunction (Gst.DataQueue queue, uint visible, uint bytes, uint64 time, pointer checkdata);
+ public static delegate bool DataQueueCheckFullFunction (Gst.DataQueue queue, uint visible, uint bytes, uint64 time, void* checkdata);
[CCode (cheader_filename = "gst/base/gsttypefindhelper.h")]
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-check-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-check-0.10.vapi (original)
+++ trunk/vapi/gstreamer-check-0.10.vapi Sat Apr 19 16:06:52 2008
@@ -23,7 +23,7 @@
[CCode (cheader_filename = "gst/gst.h")]
public static void check_message_error (Gst.Message message, Gst.MessageType type, GLib.Quark domain, int code);
[CCode (cheader_filename = "gst/gst.h")]
- public static int check_run_suite (pointer suite, string name, string fname);
+ public static int check_run_suite (void* suite, string name, string fname);
[CCode (cheader_filename = "gst/gst.h")]
public static weak Gst.Element check_setup_element (string factory);
[CCode (cheader_filename = "gst/gst.h")]
Modified: trunk/vapi/gstreamer-controller-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-controller-0.10.vapi (original)
+++ trunk/vapi/gstreamer-controller-0.10.vapi Sat Apr 19 16:06:52 2008
@@ -2,22 +2,22 @@
[CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
namespace Gst {
- [CCode (cprefix = "GST_INTERPOLATE_", cheader_filename = "gst/controller/gstcontroller.h")]
+ [CCode (cprefix = "GST_INTERPOLATE_", has_type_id = "0", cheader_filename = "gst/controller/gstcontroller.h")]
public enum InterpolateMode {
NONE,
TRIGGER,
LINEAR,
QUADRATIC,
CUBIC,
- USER,
+ USER
}
- [CCode (cprefix = "", cheader_filename = "gst/controller/gstlfocontrolsource.h")]
+ [CCode (cprefix = "", has_type_id = "0", cheader_filename = "gst/controller/gstlfocontrolsource.h")]
public enum LFOWaveform {
Sine waveform (default),
Square waveform,
Saw waveform,
Reverse saw waveform,
- Triangle waveform,
+ Triangle waveform
}
[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
public class TimedValue {
@@ -29,7 +29,7 @@
public weak string property_name;
public int nbsamples;
public weak Gst.ClockTime sample_interval;
- public pointer values;
+ public void* values;
}
[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
public class ControlSource : GLib.Object {
@@ -51,10 +51,10 @@
public static bool init (int argc, out weak string argv);
public Controller (GLib.Object object);
public Controller.list (GLib.Object object, GLib.List list);
- public Controller.valist (GLib.Object object, pointer var_args);
+ public Controller.valist (GLib.Object object, void* var_args);
public bool remove_properties ();
public bool remove_properties_list (GLib.List list);
- public bool remove_properties_valist (pointer var_args);
+ public bool remove_properties_valist (void* var_args);
public bool set (string property_name, Gst.ClockTime timestamp, GLib.Value value);
public bool set_control_source (string property_name, Gst.ControlSource csource);
public void set_disabled (bool disabled);
Modified: trunk/vapi/gstreamer-dataprotocol-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-dataprotocol-0.10.vapi (original)
+++ trunk/vapi/gstreamer-dataprotocol-0.10.vapi Sat Apr 19 16:06:52 2008
@@ -2,24 +2,24 @@
[CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
namespace Gst {
- [CCode (cprefix = "GST_DP_HEADER_FLAG_", cheader_filename = "gst/dataprotocol/dataprotocol.h")]
+ [CCode (cprefix = "GST_DP_HEADER_FLAG_", has_type_id = "0", cheader_filename = "gst/dataprotocol/dataprotocol.h")]
public enum DPHeaderFlag {
NONE,
CRC_HEADER,
CRC_PAYLOAD,
- CRC,
+ CRC
}
- [CCode (cprefix = "GST_DP_PAYLOAD_", cheader_filename = "gst/dataprotocol/dataprotocol.h")]
+ [CCode (cprefix = "GST_DP_PAYLOAD_", has_type_id = "0", cheader_filename = "gst/dataprotocol/dataprotocol.h")]
public enum DPPayloadType {
NONE,
BUFFER,
CAPS,
- EVENT_NONE,
+ EVENT_NONE
}
- [CCode (cprefix = "", cheader_filename = "gst/dataprotocol/dataprotocol.h")]
+ [CCode (cprefix = "", has_type_id = "0", cheader_filename = "gst/dataprotocol/dataprotocol.h")]
public enum DPVersion {
GDP Version 0.2,
- GDP Version 1.0,
+ GDP Version 1.0
}
[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
public class DPPacketizer {
@@ -27,8 +27,7 @@
public Gst.DPHeaderFromBufferFunction header_from_buffer;
public Gst.DPPacketFromCapsFunction packet_from_caps;
public Gst.DPPacketFromEventFunction packet_from_event;
- [NoArrayLength]
- public weak pointer[] _gst_reserved;
+ public void* _gst_reserved;
public DPPacketizer (Gst.DPVersion version);
}
[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
Modified: trunk/vapi/gstreamer-fft-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-fft-0.10.vapi (original)
+++ trunk/vapi/gstreamer-fft-0.10.vapi Sat Apr 19 16:06:52 2008
@@ -2,21 +2,20 @@
[CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
namespace Gst {
- [CCode (cprefix = "GST_FFT_WINDOW_", cheader_filename = "gst/fft/gstfft.h")]
+ [CCode (cprefix = "GST_FFT_WINDOW_", has_type_id = "0", cheader_filename = "gst/fft/gstfft.h")]
public enum FFTWindow {
RECTANGULAR,
HAMMING,
HANN,
BARTLETT,
- BLACKMAN,
+ BLACKMAN
}
[CCode (cheader_filename = "gst/fft/gstfftf32.h")]
public class FFTF32 {
- public pointer cfg;
+ public void* cfg;
public bool inverse;
public int len;
- [NoArrayLength]
- public weak pointer[] _padding;
+ public void* _padding;
public void fft (float timedata, Gst.FFTF32Complex freqdata);
public void inverse_fft (Gst.FFTF32Complex freqdata, float timedata);
public FFTF32 (int len, bool inverse);
@@ -29,11 +28,10 @@
}
[CCode (cheader_filename = "gst/fft/gstfftf64.h")]
public class FFTF64 {
- public pointer cfg;
+ public void* cfg;
public bool inverse;
public int len;
- [NoArrayLength]
- public weak pointer[] _padding;
+ public void* _padding;
public void fft (double timedata, Gst.FFTF64Complex freqdata);
public void inverse_fft (Gst.FFTF64Complex freqdata, double timedata);
public FFTF64 (int len, bool inverse);
@@ -46,11 +44,10 @@
}
[CCode (cheader_filename = "gst/fft/gstffts16.h")]
public class FFTS16 {
- public pointer cfg;
+ public void* cfg;
public bool inverse;
public int len;
- [NoArrayLength]
- public weak pointer[] _padding;
+ public void* _padding;
public void fft (short timedata, Gst.FFTS16Complex freqdata);
public void inverse_fft (Gst.FFTS16Complex freqdata, short timedata);
public FFTS16 (int len, bool inverse);
@@ -63,11 +60,10 @@
}
[CCode (cheader_filename = "gst/fft/gstffts32.h")]
public class FFTS32 {
- public pointer cfg;
+ public void* cfg;
public bool inverse;
public int len;
- [NoArrayLength]
- public weak pointer[] _padding;
+ public void* _padding;
public void fft (int timedata, Gst.FFTS32Complex freqdata);
public void inverse_fft (Gst.FFTS32Complex freqdata, int timedata);
public FFTS32 (int len, bool inverse);
Modified: trunk/vapi/gstreamer-interfaces-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-interfaces-0.10.vapi (original)
+++ trunk/vapi/gstreamer-interfaces-0.10.vapi Sat Apr 19 16:06:52 2008
@@ -2,31 +2,31 @@
[CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
namespace Gst {
- [CCode (cprefix = "GST_COLOR_BALANCE_", cheader_filename = "gst/interfaces/colorbalance.h")]
+ [CCode (cprefix = "GST_COLOR_BALANCE_", has_type_id = "0", cheader_filename = "gst/interfaces/colorbalance.h")]
public enum ColorBalanceType {
HARDWARE,
- SOFTWARE,
+ SOFTWARE
}
- [CCode (cprefix = "GST_MIXER_MESSAGE_", cheader_filename = "gst/interfaces/mixer.h")]
+ [CCode (cprefix = "GST_MIXER_MESSAGE_", has_type_id = "0", cheader_filename = "gst/interfaces/mixer.h")]
public enum MixerMessageType {
INVALID,
MUTE_TOGGLED,
RECORD_TOGGLED,
VOLUME_CHANGED,
- OPTION_CHANGED,
+ OPTION_CHANGED
}
- [CCode (cprefix = "GST_MIXER_", cheader_filename = "gst/interfaces/mixer.h")]
+ [CCode (cprefix = "GST_MIXER_", has_type_id = "0", cheader_filename = "gst/interfaces/mixer.h")]
public enum MixerType {
HARDWARE,
- SOFTWARE,
+ SOFTWARE
}
- [CCode (cprefix = "GST_MIXER_FLAG_", cheader_filename = "gst/interfaces/mixer.h")]
+ [CCode (cprefix = "GST_MIXER_FLAG_", has_type_id = "0", cheader_filename = "gst/interfaces/mixer.h")]
[Flags]
public enum MixerFlags {
NONE,
- AUTO_NOTIFICATIONS,
+ AUTO_NOTIFICATIONS
}
- [CCode (cprefix = "GST_MIXER_TRACK_", cheader_filename = "gst/interfaces/mixertrack.h")]
+ [CCode (cprefix = "GST_MIXER_TRACK_", has_type_id = "0", cheader_filename = "gst/interfaces/mixertrack.h")]
[Flags]
public enum MixerTrackFlags {
INPUT,
@@ -34,15 +34,15 @@
MUTE,
RECORD,
MASTER,
- SOFTWARE,
+ SOFTWARE
}
- [CCode (cprefix = "GST_TUNER_CHANNEL_", cheader_filename = "gst/interfaces/tunerchannel.h")]
+ [CCode (cprefix = "GST_TUNER_CHANNEL_", has_type_id = "0", cheader_filename = "gst/interfaces/tunerchannel.h")]
[Flags]
public enum TunerChannelFlags {
INPUT,
OUTPUT,
FREQUENCY,
- AUDIO,
+ AUDIO
}
[CCode (cheader_filename = "gst/interfaces/colorbalancechannel.h")]
public class ColorBalanceChannel : GLib.Object {
@@ -120,7 +120,7 @@
[HasEmitter]
public signal void record_toggled (Gst.MixerTrack channel, bool record);
[HasEmitter]
- public signal void volume_changed (Gst.MixerTrack channel, pointer volumes);
+ public signal void volume_changed (Gst.MixerTrack channel, void* volumes);
}
[CCode (cheader_filename = "gst/interfaces/navigation.h")]
public interface Navigation {
@@ -140,7 +140,7 @@
public abstract GLib.ValueArray get_values (GLib.ParamSpec pspec);
public abstract bool needs_probe (GLib.ParamSpec pspec);
public abstract void probe_property (GLib.ParamSpec pspec);
- public signal void probe_needed (pointer pspec);
+ public signal void probe_needed (void* pspec);
}
[CCode (cheader_filename = "gst/interfaces/tunerchannel.h")]
public interface Tuner : Gst.ImplementsInterface, Gst.Element {
Modified: trunk/vapi/gstreamer-net-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-net-0.10.vapi (original)
+++ trunk/vapi/gstreamer-net-0.10.vapi Sat Apr 19 16:06:52 2008
@@ -7,17 +7,17 @@
public weak Gst.ClockTime local_time;
public weak Gst.ClockTime remote_time;
public NetTimePacket (uchar buffer);
- public static weak Gst.NetTimePacket receive (int fd, pointer addr, uint32 len);
- public int send (int fd, pointer addr, uint32 len);
+ public static weak Gst.NetTimePacket receive (int fd, void* addr, uint32 len);
+ public int send (int fd, void* addr, uint32 len);
public uchar serialize ();
}
[CCode (cheader_filename = "gst/net/gstnet.h")]
public class NetClientClock : Gst.SystemClock {
public int sock;
[NoArrayLength]
- public weak int[] control_sock;
+ public int[] control_sock;
public weak Gst.ClockTime current_timeout;
- public pointer servaddr;
+ public void* servaddr;
public weak GLib.Thread thread;
public NetClientClock (string name, string remote_address, int remote_port, Gst.ClockTime base_time);
[NoAccessorMethod]
@@ -29,7 +29,7 @@
public class NetTimeProvider : Gst.Object {
public int sock;
[NoArrayLength]
- public weak int[] control_sock;
+ public int[] control_sock;
public weak GLib.Thread thread;
public NetTimeProvider (Gst.Clock clock, string address, int port);
[NoAccessorMethod]
Modified: trunk/vapi/gstreamer-netbuffer-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-netbuffer-0.10.vapi (original)
+++ trunk/vapi/gstreamer-netbuffer-0.10.vapi Sat Apr 19 16:06:52 2008
@@ -2,19 +2,18 @@
[CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
namespace Gst {
- [CCode (cprefix = "GST_NET_TYPE_", cheader_filename = "gst/netbuffer/gstnetbuffer.h")]
+ [CCode (cprefix = "GST_NET_TYPE_", has_type_id = "0", cheader_filename = "gst/netbuffer/gstnetbuffer.h")]
public enum NetType {
UNKNOWN,
IP4,
- IP6,
+ IP6
}
[CCode (cheader_filename = "gst/netbuffer/gstnetbuffer.h")]
public class NetAddress {
public Gst.NetType type;
- public pointer address;
+ public void* address;
public ushort port;
- [NoArrayLength]
- public weak pointer[] _gst_reserved;
+ public void* _gst_reserved;
[CCode (cname = "gst_netaddress_get_ip4_address")]
public bool get_ip4_address (uint address, ushort port);
[CCode (cname = "gst_netaddress_get_ip6_address")]
@@ -31,15 +30,13 @@
public weak Gst.Buffer buffer;
public weak Gst.NetAddress from;
public weak Gst.NetAddress to;
- [NoArrayLength]
- public weak pointer[] _gst_reserved;
+ public void* _gst_reserved;
[CCode (cname = "gst_netbuffer_new")]
public NetBuffer ();
}
[CCode (cheader_filename = "gst/netbuffer/gstnetbuffer.h")]
public class NetBufferClass {
public weak Gst.BufferClass buffer_class;
- [NoArrayLength]
- public weak pointer[] _gst_reserved;
+ public void* _gst_reserved;
}
}
Modified: trunk/vapi/gstreamer-pbutils-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-pbutils-0.10.vapi (original)
+++ trunk/vapi/gstreamer-pbutils-0.10.vapi Sat Apr 19 16:06:52 2008
@@ -2,7 +2,7 @@
[CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
namespace Gst {
- [CCode (cprefix = "GST_INSTALL_PLUGINS_", cheader_filename = "gst/pbutils/pbutils.h")]
+ [CCode (cprefix = "GST_INSTALL_PLUGINS_", has_type_id = "0", cheader_filename = "gst/pbutils/pbutils.h")]
public enum InstallPluginsReturn {
SUCCESS,
NOT_FOUND,
@@ -14,7 +14,7 @@
STARTED_OK,
INTERNAL_FAILURE,
HELPER_MISSING,
- INSTALL_IN_PROGRESS,
+ INSTALL_IN_PROGRESS
}
[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
public class InstallPluginsContext : GLib.Boxed {
Modified: trunk/vapi/gstreamer-rtp-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-rtp-0.10.vapi (original)
+++ trunk/vapi/gstreamer-rtp-0.10.vapi Sat Apr 19 16:06:52 2008
@@ -2,7 +2,7 @@
[CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
namespace Gst {
- [CCode (cprefix = "GST_RTCP_SDES_", cheader_filename = "gst/rtp/gstrtcpbuffer.h")]
+ [CCode (cprefix = "GST_RTCP_SDES_", has_type_id = "0", cheader_filename = "gst/rtp/gstrtcpbuffer.h")]
public enum RTCPSDESType {
INVALID,
END,
@@ -13,18 +13,18 @@
LOC,
TOOL,
NOTE,
- PRIV,
+ PRIV
}
- [CCode (cprefix = "GST_RTCP_TYPE_", cheader_filename = "gst/rtp/gstrtcpbuffer.h")]
+ [CCode (cprefix = "GST_RTCP_TYPE_", has_type_id = "0", cheader_filename = "gst/rtp/gstrtcpbuffer.h")]
public enum RTCPType {
INVALID,
SR,
RR,
SDES,
BYE,
- APP,
+ APP
}
- [CCode (cprefix = "GST_RTP_PAYLOAD_", cheader_filename = "gst/rtp/gstbasertpaudiopayload.h")]
+ [CCode (cprefix = "GST_RTP_PAYLOAD_", has_type_id = "0", cheader_filename = "gst/rtp/gstbasertpaudiopayload.h")]
public enum RTPPayload {
PCMU,
1016,
@@ -51,7 +51,7 @@
H261,
MPV,
MP2T,
- H263,
+ H263
}
[CCode (cheader_filename = "gst/rtp/gstrtcpbuffer.h")]
public class RTCPPacket {
@@ -123,7 +123,7 @@
public class BaseRTPDepayload : Gst.Element {
public weak Gst.Pad sinkpad;
public weak Gst.Pad srcpad;
- public pointer queuelock;
+ public void* queuelock;
public bool thread_running;
public weak GLib.Thread thread;
public uint clock_rate;
@@ -248,9 +248,9 @@
[CCode (cheader_filename = "gst/gst.h")]
public static weak Gst.Buffer rtcp_buffer_new (uint mtu);
[CCode (cheader_filename = "gst/gst.h")]
- public static weak Gst.Buffer rtcp_buffer_new_copy_data (pointer data, uint len);
+ public static weak Gst.Buffer rtcp_buffer_new_copy_data (void* data, uint len);
[CCode (cheader_filename = "gst/gst.h")]
- public static weak Gst.Buffer rtcp_buffer_new_take_data (pointer data, uint len);
+ public static weak Gst.Buffer rtcp_buffer_new_take_data (void* data, uint len);
[CCode (cheader_filename = "gst/gst.h")]
public static bool rtcp_buffer_validate (Gst.Buffer buffer);
[CCode (cheader_filename = "gst/gst.h")]
@@ -280,7 +280,7 @@
[CCode (cheader_filename = "gst/gst.h")]
public static bool rtp_buffer_get_extension (Gst.Buffer buffer);
[CCode (cheader_filename = "gst/gst.h")]
- public static bool rtp_buffer_get_extension_data (Gst.Buffer buffer, ushort bits, pointer data, uint wordlen);
+ public static bool rtp_buffer_get_extension_data (Gst.Buffer buffer, ushort bits, void* data, uint wordlen);
[CCode (cheader_filename = "gst/gst.h")]
public static uint rtp_buffer_get_header_len (Gst.Buffer buffer);
[CCode (cheader_filename = "gst/gst.h")]
@@ -290,7 +290,7 @@
[CCode (cheader_filename = "gst/gst.h")]
public static bool rtp_buffer_get_padding (Gst.Buffer buffer);
[CCode (cheader_filename = "gst/gst.h")]
- public static pointer rtp_buffer_get_payload (Gst.Buffer buffer);
+ public static void* rtp_buffer_get_payload (Gst.Buffer buffer);
[CCode (cheader_filename = "gst/gst.h")]
public static weak Gst.Buffer rtp_buffer_get_payload_buffer (Gst.Buffer buffer);
[CCode (cheader_filename = "gst/gst.h")]
@@ -312,9 +312,9 @@
[CCode (cheader_filename = "gst/gst.h")]
public static weak Gst.Buffer rtp_buffer_new_allocate_len (uint packet_len, uchar pad_len, uchar csrc_count);
[CCode (cheader_filename = "gst/gst.h")]
- public static weak Gst.Buffer rtp_buffer_new_copy_data (pointer data, uint len);
+ public static weak Gst.Buffer rtp_buffer_new_copy_data (void* data, uint len);
[CCode (cheader_filename = "gst/gst.h")]
- public static weak Gst.Buffer rtp_buffer_new_take_data (pointer data, uint len);
+ public static weak Gst.Buffer rtp_buffer_new_take_data (void* data, uint len);
[CCode (cheader_filename = "gst/gst.h")]
public static void rtp_buffer_pad_to (Gst.Buffer buffer, uint len);
[CCode (cheader_filename = "gst/gst.h")]
Modified: trunk/vapi/gstreamer-rtsp-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-rtsp-0.10.vapi (original)
+++ trunk/vapi/gstreamer-rtsp-0.10.vapi Sat Apr 19 16:06:52 2008
@@ -2,19 +2,19 @@
[CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
namespace Gst {
- [CCode (cprefix = "GST_RTSP_AUTH_", cheader_filename = "gst/rtsp/gstrtspconnection.h")]
+ [CCode (cprefix = "GST_RTSP_AUTH_", has_type_id = "0", cheader_filename = "gst/rtsp/gstrtspconnection.h")]
public enum RTSPAuthMethod {
NONE,
BASIC,
- DIGEST,
+ DIGEST
}
- [CCode (cprefix = "GST_RTSP_FAM_", cheader_filename = "gst/rtsp/gstrtspdefs.h")]
+ [CCode (cprefix = "GST_RTSP_FAM_", has_type_id = "0", cheader_filename = "gst/rtsp/gstrtspdefs.h")]
public enum RTSPFamily {
NONE,
INET,
- INET6,
+ INET6
}
- [CCode (cprefix = "GST_RTSP_HDR_", cheader_filename = "gst/rtsp/gstrtspdefs.h")]
+ [CCode (cprefix = "GST_RTSP_HDR_", has_type_id = "0", cheader_filename = "gst/rtsp/gstrtspdefs.h")]
public enum RTSPHeaderField {
INVALID,
ACCEPT,
@@ -69,37 +69,37 @@
MAX_ASM_WIDTH,
LANGUAGE,
PLAYER_START_TIME,
- LOCATION,
+ LOCATION
}
- [CCode (cprefix = "GST_RTSP_LOWER_TRANS_", cheader_filename = "gst/rtsp/gstrtspextension.h")]
+ [CCode (cprefix = "GST_RTSP_LOWER_TRANS_", has_type_id = "0", cheader_filename = "gst/rtsp/gstrtspextension.h")]
public enum RTSPLowerTrans {
UNKNOWN,
UDP,
UDP_MCAST,
- TCP,
+ TCP
}
- [CCode (cprefix = "GST_RTSP_MESSAGE_", cheader_filename = "gst/rtsp/gstrtspmessage.h")]
+ [CCode (cprefix = "GST_RTSP_MESSAGE_", has_type_id = "0", cheader_filename = "gst/rtsp/gstrtspmessage.h")]
public enum RTSPMsgType {
INVALID,
REQUEST,
RESPONSE,
- DATA,
+ DATA
}
- [CCode (cprefix = "GST_RTSP_PROFILE_", cheader_filename = "gst/rtsp/gstrtsptransport.h")]
+ [CCode (cprefix = "GST_RTSP_PROFILE_", has_type_id = "0", cheader_filename = "gst/rtsp/gstrtsptransport.h")]
public enum RTSPProfile {
UNKNOWN,
AVP,
- SAVP,
+ SAVP
}
- [CCode (cprefix = "GST_RTSP_RANGE_", cheader_filename = "gst/rtsp/gstrtsprange.h")]
+ [CCode (cprefix = "GST_RTSP_RANGE_", has_type_id = "0", cheader_filename = "gst/rtsp/gstrtsprange.h")]
public enum RTSPRangeUnit {
SMPTE,
SMPTE_30_DROP,
SMPTE_25,
NPT,
- CLOCK,
+ CLOCK
}
- [CCode (cprefix = "GST_RTSP_", cheader_filename = "gst/rtsp/gstrtspconnection.h")]
+ [CCode (cprefix = "GST_RTSP_", has_type_id = "0", cheader_filename = "gst/rtsp/gstrtspconnection.h")]
public enum RTSPResult {
OK,
ERROR,
@@ -116,18 +116,18 @@
ENET,
ENOTIP,
ETIMEOUT,
- ELAST,
+ ELAST
}
- [CCode (cprefix = "GST_RTSP_STATE_", cheader_filename = "gst/rtsp/gstrtspdefs.h")]
+ [CCode (cprefix = "GST_RTSP_STATE_", has_type_id = "0", cheader_filename = "gst/rtsp/gstrtspdefs.h")]
public enum RTSPState {
INVALID,
INIT,
READY,
SEEKING,
PLAYING,
- RECORDING,
+ RECORDING
}
- [CCode (cprefix = "GST_RTSP_STS_", cheader_filename = "gst/rtsp/gstrtspdefs.h")]
+ [CCode (cprefix = "GST_RTSP_STS_", has_type_id = "0", cheader_filename = "gst/rtsp/gstrtspdefs.h")]
public enum RTSPStatusCode {
INVALID,
CONTINUE,
@@ -173,32 +173,32 @@
SERVICE_UNAVAILABLE,
GATEWAY_TIMEOUT,
RTSP_VERSION_NOT_SUPPORTED,
- OPTION_NOT_SUPPORTED,
+ OPTION_NOT_SUPPORTED
}
- [CCode (cprefix = "GST_RTSP_TIME_", cheader_filename = "gst/rtsp/gstrtsprange.h")]
+ [CCode (cprefix = "GST_RTSP_TIME_", has_type_id = "0", cheader_filename = "gst/rtsp/gstrtsprange.h")]
public enum RTSPTimeType {
SECONDS,
NOW,
- END,
+ END
}
- [CCode (cprefix = "GST_RTSP_TRANS_", cheader_filename = "gst/rtsp/gstrtsptransport.h")]
+ [CCode (cprefix = "GST_RTSP_TRANS_", has_type_id = "0", cheader_filename = "gst/rtsp/gstrtsptransport.h")]
public enum RTSPTransMode {
UNKNOWN,
RTP,
- RDT,
+ RDT
}
- [CCode (cprefix = "GST_RTSP_VERSION_", cheader_filename = "gst/rtsp/gstrtspdefs.h")]
+ [CCode (cprefix = "GST_RTSP_VERSION_", has_type_id = "0", cheader_filename = "gst/rtsp/gstrtspdefs.h")]
public enum RTSPVersion {
INVALID,
- 1_0,
+ 1_0
}
- [CCode (cprefix = "GST_RTSP_EV_", cheader_filename = "gst/rtsp/gstrtspconnection.h")]
+ [CCode (cprefix = "GST_RTSP_EV_", has_type_id = "0", cheader_filename = "gst/rtsp/gstrtspconnection.h")]
[Flags]
public enum RTSPEvent {
READ,
- WRITE,
+ WRITE
}
- [CCode (cprefix = "GST_RTSP_", cheader_filename = "gst/rtsp/gstrtspdefs.h")]
+ [CCode (cprefix = "GST_RTSP_", has_type_id = "0", cheader_filename = "gst/rtsp/gstrtspdefs.h")]
[Flags]
public enum RTSPMethod {
INVALID,
@@ -212,18 +212,18 @@
REDIRECT,
SETUP,
SET_PARAMETER,
- TEARDOWN,
+ TEARDOWN
}
[CCode (cheader_filename = "gst/rtsp/gstrtspconnection.h")]
public class RTSPConnection {
public weak Gst.RTSPUrl url;
public int fd;
[NoArrayLength]
- public weak int[] control_sock;
+ public int[] control_sock;
public weak string ip;
public int cseq;
[NoArrayLength]
- public weak char[] session_id;
+ public char[] session_id;
public int timeout;
public weak GLib.Timer timer;
public Gst.RTSPAuthMethod auth_method;
@@ -245,7 +245,7 @@
[CCode (cheader_filename = "gst/rtsp/gstrtspconnection.h")]
public class RTSPMessage {
public Gst.RTSPMsgType type;
- public pointer type_data;
+ public void* type_data;
public weak GLib.Array hdr_fields;
public uchar body;
public uint body_size;
@@ -338,7 +338,7 @@
public abstract Gst.RTSPResult setup_media (Gst.SDPMedia media);
public abstract Gst.RTSPResult stream_select (Gst.RTSPUrl url);
[HasEmitter]
- public signal Gst.RTSPResult send (pointer req, pointer resp);
+ public signal Gst.RTSPResult send (void* req, void* resp);
}
public const int RTSP_DEFAULT_PORT;
[CCode (cheader_filename = "gst/gst.h")]
Modified: trunk/vapi/gstreamer-sdp-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-sdp-0.10.vapi (original)
+++ trunk/vapi/gstreamer-sdp-0.10.vapi Sat Apr 19 16:06:52 2008
@@ -2,10 +2,10 @@
[CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
namespace Gst {
- [CCode (cprefix = "GST_SDP_", cheader_filename = "gst/sdp/gstsdp.h")]
+ [CCode (cprefix = "GST_SDP_", has_type_id = "0", cheader_filename = "gst/sdp/gstsdp.h")]
public enum SDPResult {
OK,
- EINVAL,
+ EINVAL
}
[CCode (cheader_filename = "gst/sdp/gstsdpmessage.h")]
public class SDPAttribute {
Modified: trunk/vapi/gstreamer-tag-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-tag-0.10.vapi (original)
+++ trunk/vapi/gstreamer-tag-0.10.vapi Sat Apr 19 16:06:52 2008
@@ -2,13 +2,13 @@
[CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
namespace Gst {
- [CCode (cprefix = "GST_TAG_DEMUX_RESULT_", cheader_filename = "gst/tag/gsttagdemux.h")]
+ [CCode (cprefix = "GST_TAG_DEMUX_RESULT_", has_type_id = "0", cheader_filename = "gst/tag/gsttagdemux.h")]
public enum TagDemuxResult {
BROKEN_TAG,
AGAIN,
- OK,
+ OK
}
- [CCode (cprefix = "GST_TAG_IMAGE_TYPE_", cheader_filename = "gst/tag/tag.h")]
+ [CCode (cprefix = "GST_TAG_IMAGE_TYPE_", has_type_id = "0", cheader_filename = "gst/tag/tag.h")]
public enum TagImageType {
UNDEFINED,
FRONT_COVER,
@@ -28,12 +28,11 @@
FISH,
ILLUSTRATION,
BAND_ARTIST_LOGO,
- PUBLISHER_STUDIO_LOGO,
+ PUBLISHER_STUDIO_LOGO
}
[CCode (cheader_filename = "gst/tag/gsttagdemux.h")]
public class TagDemux : Gst.Element {
- [NoArrayLength]
- public weak pointer[] reserved;
+ public void* reserved;
[NoWrapper]
public virtual bool identify_tag (Gst.Buffer buffer, bool start_tag, uint tag_size);
[NoWrapper]
Modified: trunk/vapi/gstreamer-video-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-video-0.10.vapi (original)
+++ trunk/vapi/gstreamer-video-0.10.vapi Sat Apr 19 16:06:52 2008
@@ -2,7 +2,7 @@
[CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
namespace Gst {
- [CCode (cprefix = "GST_VIDEO_FORMAT_", cheader_filename = "gst/video/video.h")]
+ [CCode (cprefix = "GST_VIDEO_FORMAT_", has_type_id = "0", cheader_filename = "gst/video/video.h")]
public enum VideoFormat {
UNKNOWN,
I420,
@@ -19,7 +19,7 @@
ARGB,
ABGR,
RGB,
- BGR,
+ BGR
}
[CCode (cheader_filename = "gst/video/gstvideosink.h")]
public class VideoRectangle {
Modified: trunk/vapi/gtk+-2.0.vapi
==============================================================================
--- trunk/vapi/gtk+-2.0.vapi (original)
+++ trunk/vapi/gtk+-2.0.vapi Sat Apr 19 16:06:52 2008
@@ -946,10 +946,10 @@
public void add_events (int events);
public void add_mnemonic_label (Gtk.Widget label);
public bool child_focus (Gtk.DirectionType direction);
- public static weak GLib.ParamSpec class_find_style_property (pointer klass, string property_name);
- public static void class_install_style_property (pointer klass, GLib.ParamSpec pspec);
- public static void class_install_style_property_parser (pointer klass, GLib.ParamSpec pspec, Gtk.RcPropertyParser parser);
- public static weak GLib.ParamSpec class_list_style_properties (pointer klass, uint n_properties);
+ public static weak GLib.ParamSpec class_find_style_property (void* klass, string property_name);
+ public static void class_install_style_property (void* klass, GLib.ParamSpec pspec);
+ public static void class_install_style_property_parser (void* klass, GLib.ParamSpec pspec, Gtk.RcPropertyParser parser);
+ public static weak GLib.ParamSpec class_list_style_properties (void* klass, uint n_properties);
public void class_path (uint path_length, string path, string path_reversed);
public weak Pango.Context create_pango_context ();
public weak Pango.Layout create_pango_layout (string text);
@@ -1052,7 +1052,7 @@
public void show_now ();
public void style_get (...);
public void style_get_property (string property_name, GLib.Value value);
- public void style_get_valist (string first_property_name, pointer var_args);
+ public void style_get_valist (string first_property_name, void* var_args);
public void thaw_child_notify ();
public bool translate_coordinates (Gtk.Widget dest_widget, int src_x, int src_y, int dest_x, int dest_y);
public void trigger_tooltip_query ();
@@ -1226,7 +1226,7 @@
public uint parsed;
public bool activate (uint keyval, Gdk.ModifierType modifiers, Gtk.Object object);
public void add_path (Gtk.PathType path_type, string path_pattern, Gtk.PathPriorityType priority);
- public static weak Gtk.BindingSet by_class (pointer object_class);
+ public static weak Gtk.BindingSet by_class (void* object_class);
public static weak Gtk.BindingSet find (string set_name);
public BindingSet (string set_name);
}
@@ -1410,7 +1410,7 @@
public weak Gdk.Bitmap bg_stipple;
public weak Gdk.Bitmap fg_stipple;
public int rise;
- public pointer padding1;
+ public void* padding1;
public uint underline;
public uint strikethrough;
public uint draw_bg;
@@ -1438,7 +1438,7 @@
}
[CCode (cheader_filename = "gtk/gtk.h")]
public class Type {
- public pointer @class ();
+ public void* @class ();
}
[CCode (cheader_filename = "gtk/gtk.h")]
public class WidgetAuxInfo {
@@ -1713,7 +1713,7 @@
public void connect_by_path (string accel_path, GLib.Closure closure);
public bool disconnect (GLib.Closure closure);
public bool disconnect_key (uint accel_key, Gdk.ModifierType accel_mods);
- public weak Gtk.AccelKey find (Gtk.AccelGroupFindFunc find_func, pointer data);
+ public weak Gtk.AccelKey find (Gtk.AccelGroupFindFunc find_func, void* data);
public static weak Gtk.AccelGroup from_accel_closure (GLib.Closure closure);
public void @lock ();
public AccelGroup ();
@@ -1744,8 +1744,8 @@
public static void add_entry (string accel_path, uint accel_key, Gdk.ModifierType accel_mods);
public static void add_filter (string filter_pattern);
public static bool change_entry (string accel_path, uint accel_key, Gdk.ModifierType accel_mods, bool replace);
- public static void @foreach (pointer data, Gtk.AccelMapForeach foreach_func);
- public static void foreach_unfiltered (pointer data, Gtk.AccelMapForeach foreach_func);
+ public static void @foreach (void* data, Gtk.AccelMapForeach foreach_func);
+ public static void foreach_unfiltered (void* data, Gtk.AccelMapForeach foreach_func);
public static weak Gtk.AccelMap get ();
public static void load (string file_name);
public static void load_fd (int fd);
@@ -1820,12 +1820,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_actions (Gtk.ActionEntry[] entries, void* user_data);
+ public void add_actions_full (Gtk.ActionEntry[] entries, void* user_data, GLib.DestroyNotify destroy);
public void add_radio_actions (Gtk.RadioActionEntry[] entries, int value, Gtk.RadioActionCallback on_change);
public void add_radio_actions_full (Gtk.RadioActionEntry[] entries, int value, Gtk.RadioActionCallback on_change, 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_toggle_actions (Gtk.ToggleActionEntry[] entries, void* user_data);
+ public void add_toggle_actions_full (Gtk.ToggleActionEntry[] entries, void* user_data, GLib.DestroyNotify destroy);
public weak string get_name ();
public bool get_sensitive ();
public bool get_visible ();
@@ -1833,7 +1833,7 @@
public ActionGroup (string name);
public void remove_action (Gtk.Action action);
public void set_sensitive (bool sensitive);
- public void set_translate_func (Gtk.TranslateFunc func, pointer data, Gtk.DestroyNotify notify);
+ public void set_translate_func (Gtk.TranslateFunc func, void* data, Gtk.DestroyNotify notify);
public void set_translation_domain (string domain);
public void set_visible (bool visible);
public weak string translate_string (string str);
@@ -1935,7 +1935,7 @@
public int prepend_page (Gtk.Widget page);
public void remove_action_widget (Gtk.Widget child);
public void set_current_page (int page_num);
- public void set_forward_page_func (Gtk.AssistantPageFunc page_func, pointer data, GLib.DestroyNotify destroy);
+ public void set_forward_page_func (Gtk.AssistantPageFunc page_func, void* data, GLib.DestroyNotify destroy);
public void set_page_complete (Gtk.Widget page, bool complete);
public void set_page_header_image (Gtk.Widget page, Gdk.Pixbuf pixbuf);
public void set_page_side_image (Gtk.Widget page, Gdk.Pixbuf pixbuf);
@@ -1973,7 +1973,7 @@
public class Builder : GLib.Object {
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 (void* user_data);
public void connect_signals_full (Gtk.BuilderConnectFunc func);
public static GLib.Quark error_quark ();
public weak GLib.Object get_object (string name);
@@ -2491,7 +2491,7 @@
public void set_column_span_column (int column_span);
public void set_focus_on_click (bool focus_on_click);
public void set_model (Gtk.TreeModel model);
- public void set_row_separator_func (Gtk.TreeViewRowSeparatorFunc func, pointer data, Gtk.DestroyNotify destroy);
+ public void set_row_separator_func (Gtk.TreeViewRowSeparatorFunc func, void* data, Gtk.DestroyNotify destroy);
public void set_row_span_column (int row_span);
public void set_title (string title);
public void set_wrap_width (int width);
@@ -2534,14 +2534,14 @@
public void add_with_properties (Gtk.Widget widget, ...);
public void child_get (Gtk.Widget child, ...);
public void child_get_property (Gtk.Widget child, string property_name, GLib.Value value);
- public void child_get_valist (Gtk.Widget child, string first_property_name, pointer var_args);
+ public void child_get_valist (Gtk.Widget child, string first_property_name, void* var_args);
public void child_set (Gtk.Widget child, ...);
public void child_set_property (Gtk.Widget child, string property_name, GLib.Value value);
- public void child_set_valist (Gtk.Widget child, string first_property_name, pointer var_args);
+ public void child_set_valist (Gtk.Widget child, string first_property_name, void* var_args);
public static weak GLib.ParamSpec class_find_child_property (GLib.ObjectClass cclass, string property_name);
- public static void class_install_child_property (pointer cclass, uint property_id, GLib.ParamSpec pspec);
+ public static void class_install_child_property (void* cclass, uint property_id, GLib.ParamSpec pspec);
public static weak GLib.ParamSpec class_list_child_properties (GLib.ObjectClass cclass, uint n_properties);
- public void @foreach (Gtk.Callback callback, pointer callback_data);
+ public void @foreach (Gtk.Callback callback, void* callback_data);
public uint get_border_width ();
public weak GLib.List get_children ();
public bool get_focus_chain (GLib.List focusable_widgets);
@@ -2560,7 +2560,7 @@
public virtual GLib.Type child_type ();
[NoWrapper]
public virtual weak string composite_name (Gtk.Widget child);
- public virtual void forall (Gtk.Callback callback, pointer callback_data);
+ public virtual void forall (Gtk.Callback callback, void* callback_data);
[NoWrapper]
public virtual void get_child_property (Gtk.Widget child, uint property_id, GLib.Value value, GLib.ParamSpec pspec);
[NoWrapper]
@@ -2635,7 +2635,7 @@
}
[CCode (cheader_filename = "gtk/gtk.h")]
public class DrawingArea : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
- public pointer draw_data;
+ public void* draw_data;
public DrawingArea ();
}
[CCode (cheader_filename = "gtk/gtk.h")]
@@ -2751,7 +2751,7 @@
public EntryCompletion ();
public void set_inline_completion (bool inline_completion);
public void set_inline_selection (bool inline_selection);
- public void set_match_func (Gtk.EntryCompletionMatchFunc func, pointer func_data, GLib.DestroyNotify func_notify);
+ public void set_match_func (Gtk.EntryCompletionMatchFunc func, void* func_data, GLib.DestroyNotify func_notify);
public void set_minimum_key_length (int length);
public void set_model (Gtk.TreeModel model);
public void set_popup_completion (bool popup_completion);
@@ -2836,7 +2836,7 @@
}
[CCode (cheader_filename = "gtk/gtk.h")]
public class FileFilter : Gtk.Object {
- public void add_custom (Gtk.FileFilterFlags needed, Gtk.FileFilterFunc func, pointer data, GLib.DestroyNotify notify);
+ public void add_custom (Gtk.FileFilterFlags needed, Gtk.FileFilterFunc func, void* data, GLib.DestroyNotify notify);
public void add_mime_type (string mime_type);
public void add_pattern (string pattern);
public void add_pixbuf_formats ();
@@ -3118,7 +3118,7 @@
public bool path_is_selected (Gtk.TreePath path);
public void scroll_to_path (Gtk.TreePath path, bool use_align, float row_align, float col_align);
public void select_path (Gtk.TreePath path);
- public void selected_foreach (Gtk.IconViewForeachFunc func, pointer data);
+ public void selected_foreach (Gtk.IconViewForeachFunc func, void* data);
public void set_column_spacing (int column_spacing);
public void set_columns (int columns);
public void set_cursor (Gtk.TreePath path, Gtk.CellRenderer cell, bool start_editing);
@@ -3372,13 +3372,13 @@
public LinkButton (string uri);
public LinkButton.with_label (string uri, string label);
public void set_uri (string uri);
- public static Gtk.LinkButtonUriFunc set_uri_hook (Gtk.LinkButtonUriFunc func, pointer data, GLib.DestroyNotify destroy);
+ public static Gtk.LinkButtonUriFunc set_uri_hook (Gtk.LinkButtonUriFunc func, void* data, GLib.DestroyNotify destroy);
public weak string uri { get; set; }
}
[CCode (cheader_filename = "gtk/gtk.h")]
public class ListStore : GLib.Object, Gtk.Buildable, Gtk.TreeModel, Gtk.TreeSortable, Gtk.TreeDragSource, Gtk.TreeDragDest {
public int stamp;
- public pointer seq;
+ public void* seq;
public weak GLib.List sort_list;
public int n_columns;
public int sort_column_id;
@@ -3387,7 +3387,7 @@
public GLib.Type[] column_headers;
public int length;
public Gtk.TreeIterCompareFunc default_sort_func;
- public pointer default_sort_data;
+ public void* default_sort_data;
public Gtk.DestroyNotify default_sort_destroy;
public uint columns_dirty;
public void append (out Gtk.TreeIter iter);
@@ -3410,7 +3410,7 @@
[CCode (sentinel = "-1")]
public void set (Gtk.TreeIter iter, ...);
public void set_column_types (int n_columns, GLib.Type[] types);
- public void set_valist (Gtk.TreeIter iter, pointer var_args);
+ public void set_valist (Gtk.TreeIter iter, void* var_args);
public void set_value (Gtk.TreeIter iter, int column, GLib.Value value);
public void set_valuesv (Gtk.TreeIter iter, int columns, GLib.Value[] values);
public void swap (Gtk.TreeIter a, Gtk.TreeIter b);
@@ -3422,7 +3422,7 @@
public weak Gtk.AccelGroup accel_group;
public weak string accel_path;
public Gtk.MenuPositionFunc position_func;
- public pointer position_func_data;
+ public void* position_func_data;
public uint toggle_size;
public weak Gtk.Widget toplevel;
public weak Gtk.Widget tearoff_window;
@@ -3511,7 +3511,7 @@
[HasEmitter]
public signal void toggle_size_allocate (int allocation);
[HasEmitter]
- public signal void toggle_size_request (pointer requisition);
+ public signal void toggle_size_request (void* requisition);
}
[CCode (cheader_filename = "gtk/gtk.h")]
public class MenuShell : Gtk.Container, Atk.Implementor, Gtk.Buildable {
@@ -3620,7 +3620,7 @@
public int append_page (Gtk.Widget child, Gtk.Widget tab_label);
public int append_page_menu (Gtk.Widget child, Gtk.Widget tab_label, Gtk.Widget menu_label);
public int get_current_page ();
- public pointer get_group ();
+ public void* get_group ();
public weak Gtk.Widget get_menu_label (Gtk.Widget child);
public weak string get_menu_label_text (Gtk.Widget child);
public int get_n_pages ();
@@ -3645,7 +3645,7 @@
public void remove_page (int page_num);
public void reorder_child (Gtk.Widget child, int position);
public void set_current_page (int page_num);
- public void set_group (pointer group);
+ public void set_group (void* group);
public void set_menu_label (Gtk.Widget child, Gtk.Widget menu_label);
public void set_menu_label_text (Gtk.Widget child, string menu_text);
public void set_scrollable (bool scrollable);
@@ -3657,11 +3657,11 @@
public void set_tab_label_text (Gtk.Widget child, string tab_text);
public void set_tab_pos (Gtk.PositionType pos);
public void set_tab_reorderable (Gtk.Widget child, bool reorderable);
- public static void set_window_creation_hook (Gtk.NotebookWindowCreationFunc func, pointer data, GLib.DestroyNotify destroy);
+ public static void set_window_creation_hook (Gtk.NotebookWindowCreationFunc func, void* data, GLib.DestroyNotify destroy);
public virtual int insert_page (Gtk.Widget child, Gtk.Widget tab_label, int position);
[NoAccessorMethod]
public weak bool enable_popup { get; set; }
- public weak pointer group { get; set; }
+ public weak void* group { get; set; }
[NoAccessorMethod]
public weak int group_id { get; set; }
[NoAccessorMethod]
@@ -3687,7 +3687,7 @@
public signal void page_reordered (Gtk.Widget p0, uint p1);
public signal bool reorder_tab (Gtk.DirectionType direction, bool move_to_last);
public signal bool select_page (bool move_focus);
- public signal void switch_page (pointer page, uint page_num);
+ public signal void switch_page (void* page, uint page_num);
}
[CCode (cheader_filename = "gtk/gtk.h")]
public class Object : GLib.InitiallyUnowned {
@@ -3697,7 +3697,7 @@
[NoWrapper]
public virtual void set_arg (Gtk.Arg arg, uint arg_id);
[NoAccessorMethod]
- public weak pointer user_data { get; set; }
+ public weak void* user_data { get; set; }
[HasEmitter]
public signal void destroy ();
}
@@ -4139,7 +4139,7 @@
public class RecentFilter : Gtk.Object {
public void add_age (int days);
public void add_application (string application);
- public void add_custom (Gtk.RecentFilterFlags needed, Gtk.RecentFilterFunc func, pointer data, GLib.DestroyNotify data_destroy);
+ public void add_custom (Gtk.RecentFilterFlags needed, Gtk.RecentFilterFunc func, void* data, GLib.DestroyNotify data_destroy);
public void add_group (string group);
public void add_mime_type (string mime_type);
public void add_pattern (string pattern);
@@ -4471,7 +4471,7 @@
public weak double value { get; set; }
public weak bool wrap { get; set; }
public signal void change_value (Gtk.ScrollType scroll);
- public signal int input (pointer new_value);
+ public signal int input (void* new_value);
public signal bool output ();
public signal void value_changed ();
public signal void wrapped ();
@@ -4790,14 +4790,14 @@
}
[CCode (cheader_filename = "gtk/gtk.h")]
public class TextChildAnchor : GLib.Object {
- public pointer segment;
+ public void* segment;
public bool get_deleted ();
public weak GLib.List get_widgets ();
public TextChildAnchor ();
}
[CCode (cheader_filename = "gtk/gtk.h")]
public class TextMark : GLib.Object {
- public pointer segment;
+ public void* segment;
public weak Gtk.TextBuffer get_buffer ();
public bool get_deleted ();
public bool get_left_gravity ();
@@ -4965,7 +4965,7 @@
public int anon_count;
public weak GLib.SList buffers;
public void add (Gtk.TextTag tag);
- public void @foreach (Gtk.TextTagTableForeach func, pointer data);
+ public void @foreach (Gtk.TextTagTableForeach func, void* data);
public int get_size ();
public weak Gtk.TextTag lookup (string name);
public TextTagTable ();
@@ -5254,9 +5254,9 @@
public weak Gtk.TreeModel get_model ();
public TreeModelFilter (Gtk.TreeModel child_model, Gtk.TreePath root);
public void refilter ();
- public void set_modify_func (int n_columns, GLib.Type[] types, Gtk.TreeModelFilterModifyFunc func, pointer data, Gtk.DestroyNotify destroy);
+ public void set_modify_func (int n_columns, GLib.Type[] types, Gtk.TreeModelFilterModifyFunc func, void* data, Gtk.DestroyNotify destroy);
public void set_visible_column (int column);
- public void set_visible_func (Gtk.TreeModelFilterVisibleFunc func, pointer data, Gtk.DestroyNotify destroy);
+ public void set_visible_func (Gtk.TreeModelFilterVisibleFunc func, void* data, Gtk.DestroyNotify destroy);
[NoAccessorMethod]
public weak Gtk.TreeModel child_model { get; construct; }
[NoAccessorMethod]
@@ -5264,7 +5264,7 @@
}
[CCode (cheader_filename = "gtk/gtk.h")]
public class TreeModelSort : GLib.Object, Gtk.TreeModel, Gtk.TreeSortable, Gtk.TreeDragSource {
- public pointer root;
+ public void* root;
public int stamp;
public uint child_flags;
public weak Gtk.TreeModel child_model;
@@ -5273,7 +5273,7 @@
public int sort_column_id;
public Gtk.SortType order;
public Gtk.TreeIterCompareFunc default_sort_func;
- public pointer default_sort_data;
+ public void* default_sort_data;
public Gtk.DestroyNotify default_sort_destroy;
public uint changed_id;
public uint inserted_id;
@@ -5297,23 +5297,23 @@
public weak Gtk.TreeView tree_view;
public Gtk.SelectionMode type;
public Gtk.TreeSelectionFunc user_func;
- public pointer user_data;
+ public void* user_data;
public Gtk.DestroyNotify destroy;
public int count_selected_rows ();
public Gtk.SelectionMode get_mode ();
public bool get_selected (out weak Gtk.TreeModel model, out Gtk.TreeIter iter);
public GLib.List get_selected_rows (out weak Gtk.TreeModel model);
public weak Gtk.TreeView get_tree_view ();
- public pointer get_user_data ();
+ public void* get_user_data ();
public bool iter_is_selected (Gtk.TreeIter iter);
public bool path_is_selected (Gtk.TreePath path);
public void select_all ();
public void select_iter (Gtk.TreeIter iter);
public void select_path (Gtk.TreePath path);
public void select_range (Gtk.TreePath start_path, Gtk.TreePath end_path);
- public void selected_foreach (Gtk.TreeSelectionForeachFunc func, pointer data);
+ public void selected_foreach (Gtk.TreeSelectionForeachFunc func, void* data);
public void set_mode (Gtk.SelectionMode type);
- public void set_select_function (Gtk.TreeSelectionFunc func, pointer data, Gtk.DestroyNotify destroy);
+ public void set_select_function (Gtk.TreeSelectionFunc func, void* data, Gtk.DestroyNotify destroy);
public void unselect_all ();
public void unselect_iter (Gtk.TreeIter iter);
public void unselect_path (Gtk.TreePath path);
@@ -5323,8 +5323,8 @@
[CCode (cheader_filename = "gtk/gtk.h")]
public class TreeStore : GLib.Object, Gtk.Buildable, Gtk.TreeModel, Gtk.TreeSortable, Gtk.TreeDragSource, Gtk.TreeDragDest {
public int stamp;
- public pointer root;
- public pointer last;
+ public void* root;
+ public void* last;
public int n_columns;
public int sort_column_id;
public weak GLib.List sort_list;
@@ -5332,7 +5332,7 @@
[NoArrayLength]
public GLib.Type[] column_headers;
public Gtk.TreeIterCompareFunc default_sort_func;
- public pointer default_sort_data;
+ public void* default_sort_data;
public Gtk.DestroyNotify default_sort_destroy;
public uint columns_dirty;
public void append (out Gtk.TreeIter iter, Gtk.TreeIter? parent);
@@ -5357,7 +5357,7 @@
[CCode (sentinel = "-1")]
public void set (Gtk.TreeIter iter, ...);
public void set_column_types (int n_columns, GLib.Type[] types);
- public void set_valist (Gtk.TreeIter iter, pointer var_args);
+ public void set_valist (Gtk.TreeIter iter, void* var_args);
public void set_value (Gtk.TreeIter iter, int column, GLib.Value value);
public void set_valuesv (Gtk.TreeIter iter, int columns, GLib.Value[] values);
public void swap (Gtk.TreeIter a, Gtk.TreeIter b);
@@ -5418,9 +5418,9 @@
public void get_visible_rect (out Gdk.Rectangle visible_rect);
public int insert_column (Gtk.TreeViewColumn column, int position);
public int insert_column_with_attributes (int position, string title, Gtk.CellRenderer cell, ...);
- public int insert_column_with_data_func (int position, string title, Gtk.CellRenderer cell, Gtk.TreeCellDataFunc func, pointer data, GLib.DestroyNotify dnotify);
+ public int insert_column_with_data_func (int position, string title, Gtk.CellRenderer cell, Gtk.TreeCellDataFunc func, void* data, GLib.DestroyNotify dnotify);
public bool is_rubber_banding_active ();
- public void map_expanded_rows (Gtk.TreeViewMappingFunc func, pointer data);
+ public void map_expanded_rows (Gtk.TreeViewMappingFunc func, void* data);
public void move_column_after (Gtk.TreeViewColumn column, Gtk.TreeViewColumn base_column);
public TreeView ();
public TreeView.with_model (Gtk.TreeModel model);
@@ -5430,7 +5430,7 @@
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);
+ public void set_destroy_count_func (Gtk.TreeDestroyCountFunc func, void* data, Gtk.DestroyNotify destroy);
public void set_drag_dest_row (Gtk.TreePath path, Gtk.TreeViewDropPosition pos);
public void set_enable_search (bool enable_search);
public void set_enable_tree_lines (bool enabled);
@@ -5445,13 +5445,13 @@
public void set_level_indentation (int indentation);
public void set_model (Gtk.TreeModel model);
public void set_reorderable (bool reorderable);
- public void set_row_separator_func (Gtk.TreeViewRowSeparatorFunc func, pointer data, Gtk.DestroyNotify destroy);
+ public void set_row_separator_func (Gtk.TreeViewRowSeparatorFunc func, void* data, Gtk.DestroyNotify destroy);
public void set_rubber_banding (bool enable);
public void set_rules_hint (bool setting);
public void set_search_column (int column);
public void set_search_entry (Gtk.Entry entry);
- public void set_search_equal_func (Gtk.TreeViewSearchEqualFunc search_equal_func, pointer search_user_data, Gtk.DestroyNotify search_destroy);
- public void set_search_position_func (Gtk.TreeViewSearchPositionFunc func, pointer data, GLib.DestroyNotify destroy);
+ public void set_search_equal_func (Gtk.TreeViewSearchEqualFunc search_equal_func, void* search_user_data, Gtk.DestroyNotify search_destroy);
+ public void set_search_position_func (Gtk.TreeViewSearchPositionFunc func, void* data, GLib.DestroyNotify destroy);
public void set_show_expanders (bool enabled);
public void set_tooltip_cell (Gtk.Tooltip tooltip, Gtk.TreePath path, Gtk.TreeViewColumn column, Gtk.CellRenderer cell);
public void set_tooltip_column (int column);
@@ -5556,7 +5556,7 @@
public void queue_resize ();
public void set_alignment (float xalign);
public void set_attributes (Gtk.CellRenderer cell_renderer, ...);
- public void set_cell_data_func (Gtk.CellRenderer cell_renderer, Gtk.TreeCellDataFunc func, pointer func_data, Gtk.DestroyNotify destroy);
+ public void set_cell_data_func (Gtk.CellRenderer cell_renderer, Gtk.TreeCellDataFunc func, void* func_data, Gtk.DestroyNotify destroy);
public void set_clickable (bool clickable);
public void set_expand (bool expand);
public void set_fixed_width (int fixed_width);
@@ -5850,9 +5850,9 @@
public interface Buildable {
public abstract void add_child (Gtk.Builder builder, GLib.Object child, string type);
public abstract weak GLib.Object construct_child (Gtk.Builder builder, string name);
- public abstract void custom_finished (Gtk.Builder builder, GLib.Object child, string tagname, pointer data);
- public abstract void custom_tag_end (Gtk.Builder builder, GLib.Object child, string tagname, pointer data);
- public abstract bool custom_tag_start (Gtk.Builder builder, GLib.Object child, string tagname, GLib.MarkupParser parser, pointer data);
+ public abstract void custom_finished (Gtk.Builder builder, GLib.Object child, string tagname, void* data);
+ public abstract void custom_tag_end (Gtk.Builder builder, GLib.Object child, string tagname, void* data);
+ public abstract bool custom_tag_start (Gtk.Builder builder, GLib.Object child, string tagname, GLib.MarkupParser parser, void* data);
public abstract weak GLib.Object get_internal_child (Gtk.Builder builder, string childname);
public abstract weak string get_name ();
public abstract void parser_finished (Gtk.Builder builder);
@@ -5876,7 +5876,7 @@
public abstract void pack_end (Gtk.CellRenderer cell, bool expand);
public abstract void pack_start (Gtk.CellRenderer cell, bool expand);
public abstract void reorder (Gtk.CellRenderer cell, int position);
- public abstract void set_cell_data_func (Gtk.CellRenderer cell, Gtk.CellLayoutDataFunc func, pointer func_data, GLib.DestroyNotify destroy);
+ public abstract void set_cell_data_func (Gtk.CellRenderer cell, Gtk.CellLayoutDataFunc func, void* func_data, GLib.DestroyNotify destroy);
}
[CCode (cheader_filename = "gtk/gtk.h")]
public interface Editable {
@@ -5901,7 +5901,7 @@
[HasEmitter]
public signal void delete_text (int start_pos, int end_pos);
[HasEmitter]
- public signal void insert_text (string text, int length, pointer position);
+ public signal void insert_text (string text, int length, void* position);
}
[CCode (cheader_filename = "gtk/gtk.h")]
public interface FileChooser : Gtk.Widget {
@@ -6012,7 +6012,7 @@
public abstract void select_all ();
public abstract bool select_uri (string uri) throws GLib.Error;
public abstract bool set_current_uri (string uri) throws GLib.Error;
- public abstract void set_sort_func (Gtk.RecentSortFunc sort_func, pointer sort_data, GLib.DestroyNotify data_destroy);
+ public abstract void set_sort_func (Gtk.RecentSortFunc sort_func, void* sort_data, GLib.DestroyNotify data_destroy);
public abstract void unselect_all ();
public abstract void unselect_uri (string uri);
public weak Gtk.RecentFilter filter { get; set; }
@@ -6047,7 +6047,7 @@
public bool get_iter_first (out Gtk.TreeIter iter);
public bool get_iter_from_string (out Gtk.TreeIter iter, string path_string);
public string get_string_from_iter (Gtk.TreeIter iter);
- public void get_valist (Gtk.TreeIter iter, pointer var_args);
+ public void get_valist (Gtk.TreeIter iter, void* var_args);
public abstract GLib.Type get_column_type (int index_);
public abstract Gtk.TreeModelFlags get_flags ();
public abstract bool get_iter (out Gtk.TreeIter iter, Gtk.TreePath path);
@@ -6071,7 +6071,7 @@
[HasEmitter]
public signal void row_inserted (Gtk.TreePath path, Gtk.TreeIter iter);
[HasEmitter]
- public signal void rows_reordered (Gtk.TreePath path, Gtk.TreeIter iter, pointer new_order);
+ public signal void rows_reordered (Gtk.TreePath path, Gtk.TreeIter iter, void* new_order);
}
[CCode (cheader_filename = "gtk/gtk.h")]
public interface TreeSortable : Gtk.TreeModel, GLib.Object {
@@ -6153,20 +6153,20 @@
}
[CCode (cheader_filename = "gtk/gtk.h")]
public struct TextIter {
- public pointer dummy1;
- public pointer dummy2;
+ public void* dummy1;
+ public void* dummy2;
public int dummy3;
public int dummy4;
public int dummy5;
public int dummy6;
public int dummy7;
public int dummy8;
- public pointer dummy9;
- public pointer dummy10;
+ public void* dummy9;
+ public void* dummy10;
public int dummy11;
public int dummy12;
public int dummy13;
- public pointer dummy14;
+ public void* dummy14;
public bool backward_char ();
public bool backward_chars (int count);
public bool backward_cursor_position ();
@@ -6261,14 +6261,14 @@
[CCode (cheader_filename = "gtk/gtk.h")]
public struct TreeIter {
public int stamp;
- public pointer user_data;
- public pointer user_data2;
- public pointer user_data3;
+ public void* user_data;
+ public void* user_data2;
+ public void* user_data3;
public Gtk.TreeIter copy ();
public void free ();
}
[CCode (cheader_filename = "gtk/gtk.h")]
- public static delegate void CallbackMarshal (Gtk.Object object, pointer data, Gtk.Arg[] args);
+ public static delegate void CallbackMarshal (Gtk.Object object, void* data, Gtk.Arg[] args);
[CCode (cheader_filename = "gtk/gtk.h")]
public delegate void ActionCallback (Gtk.Action action);
[CCode (cheader_filename = "gtk/gtk.h")]
@@ -6280,7 +6280,7 @@
[CCode (cheader_filename = "gtk/gtk.h")]
public delegate bool AccelGroupFindFunc (Gtk.AccelKey key, GLib.Closure closure);
[CCode (cheader_filename = "gtk/gtk.h")]
- public static delegate void AccelMapForeach (pointer data, string accel_path, uint accel_key, Gdk.ModifierType accel_mods, bool changed);
+ public static delegate void AccelMapForeach (void* data, string accel_path, uint accel_key, Gdk.ModifierType accel_mods, bool changed);
[CCode (cheader_filename = "gtk/gtk.h")]
public delegate int AssistantPageFunc (int current_page);
[CCode (cheader_filename = "gtk/gtk.h")]
@@ -6290,9 +6290,9 @@
[CCode (cheader_filename = "gtk/gtk.h")]
public delegate void CellLayoutDataFunc (Gtk.CellLayout cell_layout, Gtk.CellRenderer cell, Gtk.TreeModel tree_model, Gtk.TreeIter iter);
[CCode (cheader_filename = "gtk/gtk.h")]
- public static delegate void ClipboardClearFunc (Gtk.Clipboard clipboard, pointer user_data_or_owner);
+ public static delegate void ClipboardClearFunc (Gtk.Clipboard clipboard, void* user_data_or_owner);
[CCode (cheader_filename = "gtk/gtk.h")]
- public static delegate void ClipboardGetFunc (Gtk.Clipboard clipboard, Gtk.SelectionData selection_data, uint info, pointer user_data_or_owner);
+ public static delegate void ClipboardGetFunc (Gtk.Clipboard clipboard, Gtk.SelectionData selection_data, uint info, void* user_data_or_owner);
[CCode (cheader_filename = "gtk/gtk.h")]
public delegate void ClipboardImageReceivedFunc (Gtk.Clipboard clipboard, Gdk.Pixbuf pixbuf);
[CCode (cheader_filename = "gtk/gtk.h")]
@@ -6318,7 +6318,7 @@
[CCode (cheader_filename = "gtk/gtk.h")]
public delegate void IconViewForeachFunc (Gtk.IconView icon_view, Gtk.TreePath path);
[CCode (cheader_filename = "gtk/gtk.h")]
- public static delegate int KeySnoopFunc (Gtk.Widget grab_widget, Gdk.EventKey event, pointer func_data);
+ public static delegate int KeySnoopFunc (Gtk.Widget grab_widget, Gdk.EventKey event, void* func_data);
[CCode (cheader_filename = "gtk/gtk.h")]
public delegate void LinkButtonUriFunc (Gtk.LinkButton button, string link_);
[CCode (cheader_filename = "gtk/gtk.h")]
@@ -6344,7 +6344,7 @@
[CCode (cheader_filename = "gtk/gtk.h")]
public static delegate void SignalFunc ();
[CCode (cheader_filename = "gtk/gtk.h")]
- 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 bool TextBufferDeserializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, Gtk.TextIter iter, uchar data, ulong length, bool create_tags, void* user_data, GLib.Error error);
[CCode (cheader_filename = "gtk/gtk.h")]
public delegate uchar TextBufferSerializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, Gtk.TextIter start, Gtk.TextIter end, ulong length);
[CCode (cheader_filename = "gtk/gtk.h")]
@@ -6352,7 +6352,7 @@
[CCode (cheader_filename = "gtk/gtk.h")]
public delegate void TextTagTableForeach (Gtk.TextTag tag);
[CCode (cheader_filename = "gtk/gtk.h")]
- public static delegate weak string TranslateFunc (string path, pointer func_data);
+ public static delegate weak string TranslateFunc (string path, void* func_data);
[CCode (cheader_filename = "gtk/gtk.h")]
public delegate void TreeCellDataFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel tree_model, Gtk.TreeIter iter);
[CCode (cheader_filename = "gtk/gtk.h")]
@@ -6376,7 +6376,7 @@
[CCode (cheader_filename = "gtk/gtk.h")]
public delegate bool TreeViewRowSeparatorFunc (Gtk.TreeModel model, Gtk.TreeIter iter);
[CCode (cheader_filename = "gtk/gtk.h")]
- public static delegate bool TreeViewSearchEqualFunc (Gtk.TreeModel model, int column, string key, Gtk.TreeIter iter, pointer search_data);
+ public static delegate bool TreeViewSearchEqualFunc (Gtk.TreeModel model, int column, string key, Gtk.TreeIter iter, void* search_data);
[CCode (cheader_filename = "gtk/gtk.h")]
public delegate void TreeViewSearchPositionFunc (Gtk.TreeView tree_view, Gtk.Widget search_dialog);
[CCode (cheader_filename = "gtk/gtk.h")]
@@ -6669,13 +6669,13 @@
[CCode (cheader_filename = "gtk/gtk.h")]
public static void init ([CCode (array_length_pos = 0.9)] ref string[] argv);
[CCode (cheader_filename = "gtk/gtk.h")]
- public static void init_add (Gtk.Function function, pointer data);
+ public static void init_add (Gtk.Function function, void* data);
[CCode (cheader_filename = "gtk/gtk.h")]
public static bool init_check ([CCode (array_length_pos = 0.9)] ref string[] argv);
[CCode (cheader_filename = "gtk/gtk.h")]
public static bool init_with_args ([CCode (array_length_pos = 0.9)] ref string[] argv, string parameter_string, GLib.OptionEntry[] entries, string translation_domain) throws GLib.Error;
[CCode (cheader_filename = "gtk/gtk.h")]
- public static uint key_snooper_install (Gtk.KeySnoopFunc snooper, pointer func_data);
+ public static uint key_snooper_install (Gtk.KeySnoopFunc snooper, void* func_data);
[CCode (cheader_filename = "gtk/gtk.h")]
public static void key_snooper_remove (uint snooper_handler_id);
[CCode (cheader_filename = "gtk/gtk.h")]
@@ -6737,17 +6737,17 @@
[CCode (cheader_filename = "gtk/gtk.h")]
public static weak Gtk.PageSetup print_run_page_setup_dialog (Gtk.Window parent, Gtk.PageSetup page_setup, Gtk.PrintSettings settings);
[CCode (cheader_filename = "gtk/gtk.h")]
- public static void print_run_page_setup_dialog_async (Gtk.Window parent, Gtk.PageSetup page_setup, Gtk.PrintSettings settings, Gtk.PageSetupDoneFunc done_cb, pointer data);
+ public static void print_run_page_setup_dialog_async (Gtk.Window parent, Gtk.PageSetup page_setup, Gtk.PrintSettings settings, Gtk.PageSetupDoneFunc done_cb, void* data);
[CCode (cheader_filename = "gtk/gtk.h")]
public static void propagate_event (Gtk.Widget widget, Gdk.Event event);
[CCode (cheader_filename = "gtk/gtk.h")]
- public static uint quit_add (uint main_level, Gtk.Function function, pointer data);
+ public static uint quit_add (uint main_level, Gtk.Function function, void* data);
[CCode (cheader_filename = "gtk/gtk.h")]
public static void quit_add_destroy (uint main_level, Gtk.Object object);
[CCode (cheader_filename = "gtk/gtk.h")]
public static void quit_remove (uint quit_handler_id);
[CCode (cheader_filename = "gtk/gtk.h")]
- public static void quit_remove_by_data (pointer data);
+ public static void quit_remove_by_data (void* data);
[CCode (cheader_filename = "gtk/gtk.h")]
public static void rc_add_default_file (string filename);
[CCode (cheader_filename = "gtk/gtk.h")]
@@ -6817,7 +6817,7 @@
[CCode (cheader_filename = "gtk/gtk.h")]
public static bool stock_lookup (string stock_id, Gtk.StockItem item);
[CCode (cheader_filename = "gtk/gtk.h")]
- public static void stock_set_translate_func (string domain, Gtk.TranslateFunc func, pointer data, Gtk.DestroyNotify notify);
+ public static void stock_set_translate_func (string domain, Gtk.TranslateFunc func, void* data, Gtk.DestroyNotify notify);
[CCode (cheader_filename = "gtk/gtk.h")]
public static void target_table_free (Gtk.TargetEntry[] targets);
[CCode (cheader_filename = "gtk/gtk.h")]
Modified: trunk/vapi/gtksourceview-2.0.vapi
==============================================================================
--- trunk/vapi/gtksourceview-2.0.vapi (original)
+++ trunk/vapi/gtksourceview-2.0.vapi Sat Apr 19 16:06:52 2008
@@ -2,19 +2,19 @@
[CCode (cprefix = "Gtk", lower_case_cprefix = "gtk_")]
namespace Gtk {
- [CCode (cprefix = "GTK_SOURCE_SMART_HOME_END_", cheader_filename = "gtksourceview/gtksourceview.h")]
+ [CCode (cprefix = "GTK_SOURCE_SMART_HOME_END_", has_type_id = "0", cheader_filename = "gtksourceview/gtksourceview.h")]
public enum SourceSmartHomeEndType {
DISABLED,
BEFORE,
AFTER,
- ALWAYS,
+ ALWAYS
}
- [CCode (cprefix = "GTK_SOURCE_SEARCH_", cheader_filename = "gtksourceview/gtksourceview.h")]
+ [CCode (cprefix = "GTK_SOURCE_SEARCH_", has_type_id = "0", cheader_filename = "gtksourceview/gtksourceview.h")]
[Flags]
public enum SourceSearchFlags {
VISIBLE_ONLY,
TEXT_ONLY,
- CASE_INSENSITIVE,
+ CASE_INSENSITIVE
}
[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
public class SourceBuffer : Gtk.TextBuffer {
Modified: trunk/vapi/hildon-1.vapi
==============================================================================
--- trunk/vapi/hildon-1.vapi (original)
+++ trunk/vapi/hildon-1.vapi Sat Apr 19 16:06:52 2008
@@ -2,17 +2,17 @@
[CCode (cprefix = "Hildon", lower_case_cprefix = "hildon_")]
namespace Hildon {
- [CCode (cprefix = "HILDON_CAPTION_POSITION_", cheader_filename = "hildon/hildon.h")]
+ [CCode (cprefix = "HILDON_CAPTION_POSITION_", has_type_id = "0", cheader_filename = "hildon/hildon.h")]
public enum CaptionIconPosition {
LEFT,
- RIGHT,
+ RIGHT
}
- [CCode (cprefix = "HILDON_CAPTION_", cheader_filename = "hildon/hildon.h")]
+ [CCode (cprefix = "HILDON_CAPTION_", has_type_id = "0", cheader_filename = "hildon/hildon.h")]
public enum CaptionStatus {
OPTIONAL,
- MANDATORY,
+ MANDATORY
}
- [CCode (cprefix = "HILDON_DATE_TIME_ERROR_", cheader_filename = "hildon/hildon.h")]
+ [CCode (cprefix = "HILDON_DATE_TIME_ERROR_", has_type_id = "0", cheader_filename = "hildon/hildon.h")]
public enum DateTimeError {
NO_ERROR,
MAX_HOURS,
@@ -37,43 +37,43 @@
MAX_DURATION,
INVALID_CHAR,
INVALID_DATE,
- INVALID_TIME,
+ INVALID_TIME
}
- [CCode (cprefix = "HILDON_NOTE_TYPE_", cheader_filename = "hildon/hildon.h")]
+ [CCode (cprefix = "HILDON_NOTE_TYPE_", has_type_id = "0", cheader_filename = "hildon/hildon.h")]
public enum NoteType {
CONFIRMATION,
CONFIRMATION_BUTTON,
INFORMATION,
INFORMATION_THEME,
- PROGRESSBAR,
+ PROGRESSBAR
}
- [CCode (cprefix = "HILDON_NUMBER_EDITOR_ERROR_", cheader_filename = "hildon/hildon.h")]
+ [CCode (cprefix = "HILDON_NUMBER_EDITOR_ERROR_", has_type_id = "0", cheader_filename = "hildon/hildon.h")]
public enum NumberEditorErrorType {
MAXIMUM_VALUE_EXCEED,
MINIMUM_VALUE_EXCEED,
- ERRONEOUS_VALUE,
+ ERRONEOUS_VALUE
}
- [CCode (cprefix = "HILDON_WINDOW_CO_", cheader_filename = "hildon/hildon.h")]
+ [CCode (cprefix = "HILDON_WINDOW_CO_", has_type_id = "0", cheader_filename = "hildon/hildon.h")]
public enum WindowClipboardOperation {
COPY,
CUT,
- PASTE,
+ PASTE
}
- [CCode (cprefix = "HILDON_WIZARD_DIALOG_", cheader_filename = "hildon/hildon.h")]
+ [CCode (cprefix = "HILDON_WIZARD_DIALOG_", has_type_id = "0", cheader_filename = "hildon/hildon.h")]
public enum WizardDialogResponse {
CANCEL,
PREVIOUS,
NEXT,
- FINISH,
+ FINISH
}
- [CCode (cprefix = "HILDON_CALENDAR_", cheader_filename = "hildon/hildon.h")]
+ [CCode (cprefix = "HILDON_CALENDAR_", has_type_id = "0", cheader_filename = "hildon/hildon.h")]
[Flags]
public enum CalendarDisplayOptions {
SHOW_HEADING,
SHOW_DAY_NAMES,
NO_MONTH_CHANGE,
SHOW_WEEK_NUMBERS,
- WEEK_START_MONDAY,
+ WEEK_START_MONDAY
}
[CCode (cheader_filename = "hildon/hildon.h")]
public class Banner : Gtk.Window, Atk.Implementor, Gtk.Buildable {
@@ -100,10 +100,10 @@
public void clear ();
public BreadCrumbTrail ();
public void pop ();
- public void push (Hildon.BreadCrumb item, pointer id, GLib.DestroyNotify notify);
- public void push_icon (string text, Gtk.Widget icon, pointer id, GLib.DestroyNotify destroy);
- public void push_text (string text, pointer id, GLib.DestroyNotify notify);
- public signal bool crumb_clicked (pointer id);
+ public void push (Hildon.BreadCrumb item, void* id, GLib.DestroyNotify notify);
+ public void push_icon (string text, Gtk.Widget icon, void* id, GLib.DestroyNotify destroy);
+ public void push_text (string text, void* id, GLib.DestroyNotify notify);
+ public signal bool crumb_clicked (void* id);
public signal void move_parent ();
}
[CCode (cheader_filename = "hildon/hildon.h")]
@@ -112,13 +112,13 @@
public weak Gtk.Style label_style;
public int selected_day;
[NoArrayLength]
- public weak int[] day_month;
+ public int[] day_month;
public int num_marked_dates;
[NoArrayLength]
- public weak int[] marked_date;
+ public int[] marked_date;
public Hildon.CalendarDisplayOptions display_flags;
[NoArrayLength]
- public weak Gdk.Color[] marked_date_color;
+ public Gdk.Color[] marked_date_color;
public weak Gdk.GC gc;
public weak Gdk.GC xor_gc;
public int focus_row;
@@ -126,7 +126,7 @@
public int highlight_row;
public int highlight_col;
[NoArrayLength]
- public weak char[] grow_space;
+ public char[] grow_space;
public void clear_marks ();
public void freeze ();
public void get_date (uint year, uint month, uint day);
Modified: trunk/vapi/json-glib-1.0.vapi
==============================================================================
--- trunk/vapi/json-glib-1.0.vapi (original)
+++ trunk/vapi/json-glib-1.0.vapi Sat Apr 19 16:06:52 2008
@@ -7,12 +7,12 @@
OBJECT,
ARRAY,
VALUE,
- NULL,
+ NULL
}
[CCode (cprefix = "JSON_PARSER_ERROR_", has_type_id = "0", cheader_filename = "json-glib/json-glib.h")]
public enum ParserError {
PARSE,
- UNKNOWN,
+ UNKNOWN
}
[CCode (cprefix = "JSON_TOKEN_", has_type_id = "0", cheader_filename = "json-glib/json-glib.h")]
public enum TokenType {
@@ -21,7 +21,7 @@
FALSE,
NULL,
VAR,
- LAST,
+ LAST
}
[CCode (ref_function = "json_array_ref", unref_function = "json_array_unref", cheader_filename = "json-glib/json-glib.h")]
public class Array : GLib.Boxed {
@@ -36,7 +36,7 @@
[CCode (copy_function = "json_node_copy", cheader_filename = "json-glib/json-glib.h")]
public class Node : GLib.Boxed {
public Json.NodeType type;
- public pointer data;
+ public void* data;
public weak Json.Node parent;
public weak Json.Node copy ();
public weak Json.Array dup_array ();
@@ -100,7 +100,7 @@
public signal void array_element (Json.Array array, int index_);
public signal void array_end (Json.Array array);
public signal void array_start ();
- public signal void error (pointer error);
+ public signal void error (void* error);
public signal void object_end (Json.Object object);
public signal void object_member (Json.Object object, string member_name);
public signal void object_start ();
Modified: trunk/vapi/libgnome-2.0.vapi
==============================================================================
--- trunk/vapi/libgnome-2.0.vapi (original)
+++ trunk/vapi/libgnome-2.0.vapi Sat Apr 19 16:06:52 2008
@@ -2,7 +2,7 @@
[CCode (cprefix = "Gnome", lower_case_cprefix = "gnome_")]
namespace Gnome {
- [CCode (cprefix = "GNOME_FILE_DOMAIN_", cheader_filename = "libgnome/libgnome.h")]
+ [CCode (cprefix = "GNOME_FILE_DOMAIN_", has_type_id = "0", cheader_filename = "libgnome/libgnome.h")]
public enum FileDomain {
UNKNOWN,
LIBDIR,
@@ -16,21 +16,21 @@
APP_SOUND,
APP_PIXMAP,
APP_CONFIG,
- APP_HELP,
+ APP_HELP
}
- [CCode (cprefix = "GNOME_HELP_ERROR_", cheader_filename = "libgnome/libgnome.h")]
+ [CCode (cprefix = "GNOME_HELP_ERROR_", has_type_id = "0", cheader_filename = "libgnome/libgnome.h")]
public enum HelpError {
INTERNAL,
- NOT_FOUND,
+ NOT_FOUND
}
- [CCode (cprefix = "GTRIG_", cheader_filename = "libgnome/libgnome.h")]
+ [CCode (cprefix = "GTRIG_", has_type_id = "0", cheader_filename = "libgnome/libgnome.h")]
public enum TriggerType {
NONE,
FUNCTION,
COMMAND,
- MEDIAPLAY,
+ MEDIAPLAY
}
- [CCode (cprefix = "GNOME_URL_ERROR_", cheader_filename = "libgnome/libgnome.h")]
+ [CCode (cprefix = "GNOME_URL_ERROR_", has_type_id = "0", cheader_filename = "libgnome/libgnome.h")]
public enum URLError {
PARSE,
LAUNCH,
@@ -38,7 +38,7 @@
NO_DEFAULT,
NOT_SUPPORTED,
VFS,
- CANCELLED,
+ CANCELLED
}
[CCode (cheader_filename = "libgnome/libgnome.h")]
public class ModuleRequirement {
@@ -48,7 +48,7 @@
[CCode (cheader_filename = "libgnome/libgnome.h")]
public class Trigger {
public Gnome.TriggerType type;
- public pointer u;
+ public void* u;
public weak string level;
}
[CCode (cheader_filename = "libgnome/libgnome.h")]
@@ -60,7 +60,7 @@
public Gnome.ModuleHook instance_init;
public Gnome.ModuleHook pre_args_parse;
public Gnome.ModuleHook post_args_parse;
- public pointer _options;
+ public void* _options;
public Gnome.ModuleInitHook init_pass;
public Gnome.ModuleClassInitHook class_init;
public weak string opt_prefix;
@@ -74,8 +74,8 @@
public weak string get_human_readable_name ();
public static weak Gnome.Program init (string app_id, string app_version, Gnome.ModuleInfo module_info, [CCode (array_length_pos = 3.9)] string[] argv, ...);
public static weak Gnome.Program init_paramv (GLib.Type type, string app_id, string app_version, Gnome.ModuleInfo module_info, [CCode (array_length_pos = 4.9)] string[] argv, uint nparams, GLib.Parameter params);
- public static weak Gnome.Program initv (GLib.Type type, string app_id, string app_version, Gnome.ModuleInfo module_info, [CCode (array_length_pos = 4.9)] string[] argv, string first_property_name, pointer args);
- public static uint install_property (pointer pclass, GLib.ObjectGetPropertyFunc get_fn, GLib.ObjectSetPropertyFunc set_fn, GLib.ParamSpec pspec);
+ public static weak Gnome.Program initv (GLib.Type type, string app_id, string app_version, Gnome.ModuleInfo module_info, [CCode (array_length_pos = 4.9)] string[] argv, string first_property_name, void* args);
+ public static uint install_property (void* pclass, GLib.ObjectGetPropertyFunc get_fn, GLib.ObjectSetPropertyFunc set_fn, GLib.ParamSpec pspec);
public weak string locate_file (Gnome.FileDomain domain, string file_name, bool only_if_exists, GLib.SList ret_locations);
public static weak Gnome.ModuleInfo module_load (string mod_name);
public static void module_register (Gnome.ModuleInfo module_info);
@@ -107,18 +107,18 @@
[NoAccessorMethod]
public weak string gnome_sysconfdir { get; construct; }
[NoAccessorMethod]
- public weak pointer goption_context { get; construct; }
+ public weak void* goption_context { get; construct; }
[NoAccessorMethod]
public weak string human_readable_name { get; construct; }
[NoAccessorMethod]
- public weak pointer popt_context { get; }
+ public weak void* popt_context { get; }
[NoAccessorMethod]
public weak int popt_flags { construct; }
[NoAccessorMethod]
- public weak pointer popt_table { construct; }
+ public weak void* popt_table { construct; }
}
[CCode (cheader_filename = "libgnome/libgnome.h")]
- public static delegate void ModuleClassInitHook (pointer klass, Gnome.ModuleInfo mod_info);
+ public static delegate void ModuleClassInitHook (void* klass, Gnome.ModuleInfo mod_info);
[CCode (cheader_filename = "libgnome/libgnome.h")]
public static delegate weak GLib.OptionGroup ModuleGetGOptionGroupFunc ();
[CCode (cheader_filename = "libgnome/libgnome.h")]
Modified: trunk/vapi/libgnome-menu.vapi
==============================================================================
--- trunk/vapi/libgnome-menu.vapi (original)
+++ trunk/vapi/libgnome-menu.vapi Sat Apr 19 16:06:52 2008
@@ -2,30 +2,30 @@
[CCode (cprefix = "GMenu", lower_case_cprefix = "gmenu_")]
namespace GMenu {
- [CCode (cprefix = "GMENU_TREE_FLAGS_", cheader_filename = "gnome-menus/gmenu-tree.h")]
+ [CCode (cprefix = "GMENU_TREE_FLAGS_", has_type_id = "0", cheader_filename = "gnome-menus/gmenu-tree.h")]
public enum TreeFlags {
NONE,
INCLUDE_EXCLUDED,
SHOW_EMPTY,
INCLUDE_NODISPLAY,
- MASK,
+ MASK
}
- [CCode (cprefix = "GMENU_TREE_ITEM_", cheader_filename = "gnome-menus/gmenu-tree.h")]
+ [CCode (cprefix = "GMENU_TREE_ITEM_", has_type_id = "0", cheader_filename = "gnome-menus/gmenu-tree.h")]
public enum TreeItemType {
INVALID,
DIRECTORY,
ENTRY,
SEPARATOR,
HEADER,
- ALIAS,
+ ALIAS
}
[CCode (ref_function = "gmenu_tree_item_ref", unref_function = "gmenu_tree_item_unref", cheader_filename = "gnome-menus/gmenu-tree.h")]
public class TreeItem {
public GMenu.TreeItemType get_type ();
public TreeItem ();
public weak GMenu.TreeDirectory get_parent ();
- public pointer get_user_data ();
- public void set_user_data (pointer user_data, GLib.DestroyNotify dnotify);
+ public void* get_user_data ();
+ public void set_user_data (void* user_data, GLib.DestroyNotify dnotify);
}
[CCode (ref_function = "gmenu_tree_ref", unref_function = "gmenu_tree_unref", cheader_filename = "gnome-menus/gmenu-tree.h")]
public class Tree {
@@ -33,10 +33,10 @@
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 void* get_user_data ();
public static weak GMenu.Tree lookup (string menu_file, GMenu.TreeFlags flags);
public void remove_monitor (GMenu.TreeChangedFunc callback);
- public void set_user_data (pointer user_data, GLib.DestroyNotify dnotify);
+ public void set_user_data (void* user_data, GLib.DestroyNotify dnotify);
}
[CCode (cheader_filename = "gnome-menus/gmenu-tree.h")]
public class TreeAlias : GMenu.TreeItem {
Modified: trunk/vapi/libgnomeui-2.0.vapi
==============================================================================
--- trunk/vapi/libgnomeui-2.0.vapi (original)
+++ trunk/vapi/libgnomeui-2.0.vapi Sat Apr 19 16:06:52 2008
@@ -2,7 +2,7 @@
[CCode (cprefix = "Gnome", lower_case_cprefix = "gnome_")]
namespace Gnome {
- [CCode (cprefix = "GNOME_CLIENT_", cheader_filename = "libgnomeui/libgnomeui.h")]
+ [CCode (cprefix = "GNOME_CLIENT_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
public enum ClientState {
IDLE,
SAVING_PHASE_1,
@@ -10,77 +10,77 @@
SAVING_PHASE_2,
FROZEN,
DISCONNECTED,
- REGISTERING,
+ REGISTERING
}
- [CCode (cprefix = "GNOME_DIALOG_", cheader_filename = "libgnomeui/libgnomeui.h")]
+ [CCode (cprefix = "GNOME_DIALOG_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
public enum DialogType {
ERROR,
- NORMAL,
+ NORMAL
}
- [CCode (cprefix = "GNOME_EDGE_", cheader_filename = "libgnomeui/libgnomeui.h")]
+ [CCode (cprefix = "GNOME_EDGE_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
public enum EdgePosition {
START,
FINISH,
OTHER,
- LAST,
+ LAST
}
- [CCode (cprefix = "GNOME_FONT_PICKER_MODE_", cheader_filename = "libgnomeui/libgnomeui.h")]
+ [CCode (cprefix = "GNOME_FONT_PICKER_MODE_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
public enum FontPickerMode {
PIXMAP,
FONT_INFO,
USER_WIDGET,
- UNKNOWN,
+ UNKNOWN
}
- [CCode (cprefix = "GNOME_ICON_LIST_", cheader_filename = "libgnomeui/libgnomeui.h")]
+ [CCode (cprefix = "GNOME_ICON_LIST_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
public enum IconListMode {
ICONS,
TEXT_BELOW,
- TEXT_RIGHT,
+ TEXT_RIGHT
}
- [CCode (cprefix = "GNOME_INTERACT_", cheader_filename = "libgnomeui/libgnomeui.h")]
+ [CCode (cprefix = "GNOME_INTERACT_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
public enum InteractStyle {
NONE,
ERRORS,
- ANY,
+ ANY
}
- [CCode (cprefix = "GNOME_MDI_", cheader_filename = "libgnomeui/libgnomeui.h")]
+ [CCode (cprefix = "GNOME_MDI_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
public enum MDIMode {
NOTEBOOK,
TOPLEVEL,
MODAL,
- DEFAULT_MODE,
+ DEFAULT_MODE
}
- [CCode (cprefix = "GNOME_PASSWORD_DIALOG_REMEMBER_", cheader_filename = "libgnomeui/libgnomeui.h")]
+ [CCode (cprefix = "GNOME_PASSWORD_DIALOG_REMEMBER_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
public enum PasswordDialogRemember {
NOTHING,
SESSION,
- FOREVER,
+ FOREVER
}
- [CCode (cprefix = "GNOME_PREFERENCES_", cheader_filename = "libgnomeui/libgnomeui.h")]
+ [CCode (cprefix = "GNOME_PREFERENCES_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
public enum PreferencesType {
NEVER,
USER,
- ALWAYS,
+ ALWAYS
}
- [CCode (cprefix = "GNOME_RESTART_", cheader_filename = "libgnomeui/libgnomeui.h")]
+ [CCode (cprefix = "GNOME_RESTART_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
public enum RestartStyle {
IF_RUNNING,
ANYWAY,
IMMEDIATELY,
- NEVER,
+ NEVER
}
- [CCode (cprefix = "GNOME_SAVE_", cheader_filename = "libgnomeui/libgnomeui.h")]
+ [CCode (cprefix = "GNOME_SAVE_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
public enum SaveStyle {
GLOBAL,
LOCAL,
- BOTH,
+ BOTH
}
- [CCode (cprefix = "GNOME_THUMBNAIL_SIZE_", cheader_filename = "libgnomeui/libgnomeui.h")]
+ [CCode (cprefix = "GNOME_THUMBNAIL_SIZE_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
public enum ThumbnailSize {
NORMAL,
- LARGE,
+ LARGE
}
- [CCode (cprefix = "GNOME_APP_CONFIGURABLE_ITEM_", cheader_filename = "libgnomeui/libgnomeui.h")]
+ [CCode (cprefix = "GNOME_APP_CONFIGURABLE_ITEM_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
public enum UIInfoConfigurableTypes {
NEW,
OPEN,
@@ -113,9 +113,9 @@
REDO_MOVE,
HINT,
SCORES,
- END_GAME,
+ END_GAME
}
- [CCode (cprefix = "GNOME_APP_UI_", cheader_filename = "libgnomeui/libgnomeui.h")]
+ [CCode (cprefix = "GNOME_APP_UI_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
public enum UIInfoType {
ENDOFINFO,
ITEM,
@@ -127,43 +127,43 @@
BUILDER_DATA,
ITEM_CONFIGURABLE,
SUBTREE_STOCK,
- INCLUDE,
+ INCLUDE
}
- [CCode (cprefix = "GNOME_APP_PIXMAP_", cheader_filename = "libgnomeui/libgnomeui.h")]
+ [CCode (cprefix = "GNOME_APP_PIXMAP_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
public enum UIPixmapType {
NONE,
STOCK,
DATA,
- FILENAME,
+ FILENAME
}
- [CCode (cprefix = "GNOME_CLIENT_", cheader_filename = "libgnomeui/libgnomeui.h")]
+ [CCode (cprefix = "GNOME_CLIENT_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
[Flags]
public enum ClientFlags {
IS_CONNECTED,
RESTARTED,
- RESTORED,
+ RESTORED
}
- [CCode (cprefix = "GNOME_DATE_EDIT_", cheader_filename = "libgnomeui/libgnomeui.h")]
+ [CCode (cprefix = "GNOME_DATE_EDIT_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
[Flags]
public enum DateEditFlags {
SHOW_TIME,
24_HR,
WEEK_STARTS_ON_MONDAY,
- DISPLAY_SECONDS,
+ DISPLAY_SECONDS
}
- [CCode (cprefix = "GNOME_ICON_LOOKUP_FLAGS_", cheader_filename = "libgnomeui/libgnomeui.h")]
+ [CCode (cprefix = "GNOME_ICON_LOOKUP_FLAGS_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
[Flags]
public enum IconLookupFlags {
NONE,
EMBEDDING_TEXT,
SHOW_SMALL_IMAGES_AS_THEMSELVES,
- ALLOW_SVG_AS_THEMSELVES,
+ ALLOW_SVG_AS_THEMSELVES
}
- [CCode (cprefix = "GNOME_ICON_LOOKUP_RESULT_FLAGS_", cheader_filename = "libgnomeui/libgnomeui.h")]
+ [CCode (cprefix = "GNOME_ICON_LOOKUP_RESULT_FLAGS_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
[Flags]
public enum IconLookupResultFlags {
NONE,
- THUMBNAIL,
+ THUMBNAIL
}
[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
public class AppBarMsg {
@@ -177,7 +177,7 @@
[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
public class UIBuilderData {
public Gnome.UISignalConnectFunc connect_func;
- public pointer data;
+ public void* data;
public bool is_interp;
public Gtk.CallbackMarshal relay_func;
public Gtk.DestroyNotify destroy_func;
@@ -187,11 +187,11 @@
public Gnome.UIInfoType type;
public weak string label;
public weak string hint;
- public pointer moreinfo;
- public pointer user_data;
- public pointer unused_data;
+ public void* moreinfo;
+ public void* user_data;
+ public void* unused_data;
public Gnome.UIPixmapType pixmap_type;
- public pointer pixmap_info;
+ public void* pixmap_info;
public uint accelerator_key;
public Gdk.ModifierType ac_mods;
public weak Gtk.Widget widget;
@@ -209,11 +209,11 @@
public void @construct (string appname, string title);
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_interp (Gnome.UIInfo uiinfo, Gtk.CallbackMarshal relay_func, void* data, Gtk.DestroyNotify destroy_func);
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_interp (Gnome.UIInfo uiinfo, Gtk.CallbackMarshal relay_func, void* data, Gtk.DestroyNotify destroy_func);
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);
@@ -226,8 +226,8 @@
public static weak string helper_gettext (string str);
public void insert_menus (string path, Gnome.UIInfo menuinfo);
public void insert_menus_custom (string path, Gnome.UIInfo uiinfo, Gnome.UIBuilderData uibdata);
- public void insert_menus_interp (string path, Gnome.UIInfo menuinfo, Gtk.CallbackMarshal relay_func, pointer data, Gtk.DestroyNotify destroy_func);
- public void insert_menus_with_data (string path, Gnome.UIInfo menuinfo, pointer data);
+ public void insert_menus_interp (string path, Gnome.UIInfo menuinfo, Gtk.CallbackMarshal relay_func, void* data, Gtk.DestroyNotify destroy_func);
+ public void insert_menus_with_data (string path, Gnome.UIInfo menuinfo, void* data);
public static void install_appbar_menu_hints (Gnome.AppBar appbar, Gnome.UIInfo uiinfo);
public void install_menu_hints (Gnome.UIInfo uiinfo);
public static void install_statusbar_menu_hints (Gtk.Statusbar bar, Gnome.UIInfo uiinfo);
@@ -281,7 +281,7 @@
}
[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
public class Client : Gtk.Object {
- public pointer smc_conn;
+ public void* smc_conn;
public weak string client_id;
public weak string previous_id;
public weak string config_prefix;
@@ -308,7 +308,7 @@
public uint save_phase_2_requested;
public uint save_successfull;
public uint save_yourself_emitted;
- public pointer reserved;
+ public void* reserved;
public void add_static_arg ();
public void flush ();
public weak string get_config_prefix ();
@@ -320,8 +320,8 @@
public static weak Gnome.ModuleInfo module_info_get ();
public Client ();
public Client.without_connection ();
- public void request_interaction (Gnome.DialogType dialog_type, Gnome.InteractFunction function, pointer data);
- public void request_interaction_interp (Gnome.DialogType dialog_type, Gtk.CallbackMarshal function, pointer data, Gtk.DestroyNotify destroy);
+ public void request_interaction (Gnome.DialogType dialog_type, Gnome.InteractFunction function, void* data);
+ public void request_interaction_interp (Gnome.DialogType dialog_type, Gtk.CallbackMarshal function, void* data, Gtk.DestroyNotify destroy);
public void request_phase_2 ();
public void request_save (Gnome.SaveStyle save_style, bool shutdown, Gnome.InteractStyle interact_style, bool fast, bool global);
public void save_any_dialog (Gtk.Dialog dialog);
@@ -427,7 +427,7 @@
public void set_domain (string domain);
public void set_new_password (string password);
public void set_password (string password);
- public void set_password_quality_func (Gnome.PasswordDialogQualityFunc func, pointer data, GLib.DestroyNotify dnotify);
+ public void set_password_quality_func (Gnome.PasswordDialogQualityFunc func, void* data, GLib.DestroyNotify dnotify);
public void set_readonly_domain (bool readonly);
public void set_readonly_username (bool readonly);
public void set_remember (Gnome.PasswordDialogRemember remember);
@@ -481,9 +481,9 @@
public void save_thumbnail (Gdk.Pixbuf thumbnail, string uri, ulong original_mtime);
}
[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
- public static delegate void GdkPixbufDoneCallback (Gnome.GdkPixbufAsyncHandle handle, pointer cb_data);
+ public static delegate void GdkPixbufDoneCallback (Gnome.GdkPixbufAsyncHandle handle, void* cb_data);
[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
- public static delegate void GdkPixbufLoadCallback (Gnome.GdkPixbufAsyncHandle handle, GnomeVFS.Result error, Gdk.Pixbuf pixbuf, pointer cb_data);
+ public static delegate void GdkPixbufLoadCallback (Gnome.GdkPixbufAsyncHandle handle, GnomeVFS.Result error, Gdk.Pixbuf pixbuf, void* cb_data);
[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
public delegate void InteractFunction (Gnome.Client client, int key, Gnome.DialogType dialog_type);
[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
@@ -570,7 +570,7 @@
[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
public static weak Gdk.Pixbuf gdk_pixbuf_new_from_uri (string uri);
[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
- public static weak Gnome.GdkPixbufAsyncHandle gdk_pixbuf_new_from_uri_async (string uri, Gnome.GdkPixbufLoadCallback load_callback, Gnome.GdkPixbufDoneCallback done_callback, pointer callback_data);
+ public static weak Gnome.GdkPixbufAsyncHandle gdk_pixbuf_new_from_uri_async (string uri, Gnome.GdkPixbufLoadCallback load_callback, Gnome.GdkPixbufDoneCallback done_callback, void* callback_data);
[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
public static weak Gdk.Pixbuf gdk_pixbuf_new_from_uri_at_scale (string uri, int width, int height, bool preserve_aspect_ratio);
[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
Modified: trunk/vapi/libnotify.vapi
==============================================================================
--- trunk/vapi/libnotify.vapi (original)
+++ trunk/vapi/libnotify.vapi Sat Apr 19 16:06:52 2008
@@ -2,11 +2,11 @@
[CCode (cprefix = "Notify", lower_case_cprefix = "notify_")]
namespace Notify {
- [CCode (cprefix = "NOTIFY_URGENCY_", cheader_filename = "libnotify/notify.h")]
+ [CCode (cprefix = "NOTIFY_URGENCY_", has_type_id = "0", cheader_filename = "libnotify/notify.h")]
public enum Urgency {
LOW,
NORMAL,
- CRITICAL,
+ CRITICAL
}
[CCode (cheader_filename = "libnotify/notify.h")]
public class Notification : GLib.Object {
@@ -43,7 +43,7 @@
public signal void closed ();
}
[CCode (cheader_filename = "libnotify/notify.h")]
- public static delegate void ActionCallback (Notify.Notification p1, string p2, pointer p3);
+ public static delegate void ActionCallback (Notify.Notification p1, string p2, void* p3);
public const int EXPIRES_DEFAULT;
public const int EXPIRES_NEVER;
[CCode (cheader_filename = "libnotify/notify.h")]
Modified: trunk/vapi/liboobs-1.vapi
==============================================================================
--- trunk/vapi/liboobs-1.vapi (original)
+++ trunk/vapi/liboobs-1.vapi Sat Apr 19 16:06:52 2008
@@ -2,54 +2,54 @@
[CCode (cprefix = "Oobs", lower_case_cprefix = "oobs_")]
namespace Oobs {
- [CCode (cprefix = "OOBS_DIAL_TYPE_", cheader_filename = "oobs/oobs.h")]
+ [CCode (cprefix = "OOBS_DIAL_TYPE_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
public enum DialType {
TONES,
- PULSES,
+ PULSES
}
- [CCode (cprefix = "OOBS_IFACE_TYPE_", cheader_filename = "oobs/oobs.h")]
+ [CCode (cprefix = "OOBS_IFACE_TYPE_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
public enum IfaceType {
ETHERNET,
WIRELESS,
IRLAN,
PLIP,
- PPP,
+ PPP
}
- [CCode (cprefix = "OOBS_MODEM_VOLUME_", cheader_filename = "oobs/oobs.h")]
+ [CCode (cprefix = "OOBS_MODEM_VOLUME_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
public enum ModemVolume {
SILENT,
LOW,
MEDIUM,
- LOUD,
+ LOUD
}
- [CCode (cprefix = "OOBS_RESULT_", cheader_filename = "oobs/oobs.h")]
+ [CCode (cprefix = "OOBS_RESULT_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
public enum Result {
OK,
ACCESS_DENIED,
NO_PLATFORM,
MALFORMED_DATA,
- ERROR,
+ ERROR
}
- [CCode (cprefix = "OOBS_RUNLEVEL_", cheader_filename = "oobs/oobs.h")]
+ [CCode (cprefix = "OOBS_RUNLEVEL_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
public enum RunlevelRole {
HALT,
REBOOT,
MONOUSER,
- MULTIUSER,
+ MULTIUSER
}
- [CCode (cprefix = "OOBS_SERVICE_", cheader_filename = "oobs/oobs.h")]
+ [CCode (cprefix = "OOBS_SERVICE_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
public enum ServiceStatus {
START,
STOP,
- IGNORE,
+ IGNORE
}
- [CCode (cprefix = "OOBS_SHARE_SMB_", cheader_filename = "oobs/oobs.h")]
+ [CCode (cprefix = "OOBS_SHARE_SMB_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
[Flags]
public enum ShareSMBFlags {
ENABLED,
BROWSABLE,
PUBLIC,
- WRITABLE,
+ WRITABLE
}
[CCode (cheader_filename = "oobs/oobs.h")]
public class Platform {
@@ -71,7 +71,7 @@
[CCode (copy_function = "oobs_list_iter_copy", cheader_filename = "oobs/oobs.h")]
public class ListIter : GLib.Boxed {
public uint stamp;
- public pointer data;
+ public void* data;
public weak Oobs.ListIter copy ();
public static bool next (Oobs.List list, Oobs.ListIter iter);
}
@@ -248,9 +248,9 @@
public void insert_before (Oobs.ListIter anchor, Oobs.ListIter iter);
public void prepend (Oobs.ListIter iter);
public bool remove (Oobs.ListIter iter);
- public void set (Oobs.ListIter iter, pointer data);
+ public void set (Oobs.ListIter iter, void* data);
[NoAccessorMethod]
- public weak pointer contained_type { construct; }
+ public weak void* contained_type { construct; }
}
[CCode (cheader_filename = "oobs/oobs.h")]
public class NFSConfig : Oobs.Object {
@@ -271,11 +271,11 @@
}
[CCode (cheader_filename = "oobs/oobs.h")]
public class Object : GLib.Object {
- public Oobs.Result commit_async (Oobs.ObjectAsyncFunc func, pointer data);
+ public Oobs.Result commit_async (Oobs.ObjectAsyncFunc func, void* data);
public void ensure_update ();
public bool has_updated ();
public void process_requests ();
- public Oobs.Result update_async (Oobs.ObjectAsyncFunc func, pointer data);
+ public Oobs.Result update_async (Oobs.ObjectAsyncFunc func, void* data);
public virtual void commit ();
public virtual weak string get_authentication_action ();
public virtual void update ();
Modified: trunk/vapi/libsoup-2.2.vapi
==============================================================================
--- trunk/vapi/libsoup-2.2.vapi (original)
+++ trunk/vapi/libsoup-2.2.vapi Sat Apr 19 16:06:52 2008
@@ -2,34 +2,34 @@
[CCode (cprefix = "Soup", lower_case_cprefix = "soup_")]
namespace Soup {
- [CCode (cprefix = "SOUP_ADDRESS_FAMILY_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_ADDRESS_FAMILY_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
public enum AddressFamily {
IPV4,
- IPV6,
+ IPV6
}
- [CCode (cprefix = "SOUP_AUTH_TYPE_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_AUTH_TYPE_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
public enum AuthType {
BASIC,
- DIGEST,
+ DIGEST
}
- [CCode (cprefix = "SOUP_ALGORITHM_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_ALGORITHM_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
public enum DigestAlgorithm {
MD5,
- MD5_SESS,
+ MD5_SESS
}
- [CCode (cprefix = "SOUP_HANDLER_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_HANDLER_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
public enum HandlerPhase {
POST_REQUEST,
PRE_BODY,
BODY_CHUNK,
- POST_BODY,
+ POST_BODY
}
- [CCode (cprefix = "SOUP_HTTP_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_HTTP_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
public enum HttpVersion {
1_0,
- 1_1,
+ 1_1
}
- [CCode (cprefix = "SOUP_STATUS_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_STATUS_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
public enum KnownStatusCode {
NONE,
CANCELLED,
@@ -91,23 +91,23 @@
GATEWAY_TIMEOUT,
HTTP_VERSION_NOT_SUPPORTED,
INSUFFICIENT_STORAGE,
- NOT_EXTENDED,
+ NOT_EXTENDED
}
- [CCode (cprefix = "SOUP_MESSAGE_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_MESSAGE_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
public enum MessageFlags {
NO_REDIRECT,
OVERWRITE_CHUNKS,
- EXPECT_CONTINUE,
+ EXPECT_CONTINUE
}
- [CCode (cprefix = "SOUP_MESSAGE_STATUS_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_MESSAGE_STATUS_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
public enum MessageStatus {
IDLE,
QUEUED,
CONNECTING,
RUNNING,
- FINISHED,
+ FINISHED
}
- [CCode (cprefix = "SOUP_METHOD_ID_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_METHOD_ID_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
public enum MethodId {
UNKNOWN,
POST,
@@ -125,40 +125,40 @@
PROPFIND,
PATCH,
LOCK,
- UNLOCK,
+ UNLOCK
}
- [CCode (cprefix = "SOUP_BUFFER_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_BUFFER_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
public enum Ownership {
SYSTEM_OWNED,
USER_OWNED,
- STATIC,
+ STATIC
}
- [CCode (cprefix = "SOUP_SOCKET_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_SOCKET_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
public enum SocketIOStatus {
OK,
WOULD_BLOCK,
EOF,
- ERROR,
+ ERROR
}
- [CCode (cprefix = "SOUP_STATUS_CLASS_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_STATUS_CLASS_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
public enum StatusClass {
TRANSPORT_ERROR,
INFORMATIONAL,
SUCCESS,
REDIRECT,
CLIENT_ERROR,
- SERVER_ERROR,
+ SERVER_ERROR
}
- [CCode (cprefix = "SOUP_TRANSFER_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_TRANSFER_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
public enum TransferEncoding {
UNKNOWN,
CHUNKED,
CONTENT_LENGTH,
BYTERANGES,
NONE,
- EOF,
+ EOF
}
- [CCode (cprefix = "SOUP_XMLRPC_VALUE_TYPE_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_XMLRPC_VALUE_TYPE_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
public enum XmlrpcValueType {
BAD,
INT,
@@ -168,7 +168,7 @@
DATETIME,
BASE64,
STRUCT,
- ARRAY,
+ ARRAY
}
[CCode (free_function = "soup_message_queue_destroy", cheader_filename = "libsoup/soup.h")]
public class MessageQueue {
@@ -198,9 +198,9 @@
public class ServerAuthContext {
public uint types;
public Soup.ServerAuthCallbackFn callback;
- public pointer user_data;
- public pointer basic_info;
- public pointer digest_info;
+ public void* user_data;
+ public void* basic_info;
+ public void* digest_info;
public void challenge (Soup.Message msg, string header_name);
}
[CCode (cheader_filename = "libsoup/soup.h")]
@@ -235,7 +235,7 @@
public weak Soup.ServerAuthContext auth_ctx;
public Soup.ServerCallbackFn callback;
public Soup.ServerUnregisterFn unregister;
- public pointer user_data;
+ public void* user_data;
}
[CCode (cheader_filename = "libsoup/soup.h")]
public class SoapParameter {
@@ -292,7 +292,7 @@
public weak string get_name ();
public weak string get_physical ();
public uint get_port ();
- public pointer get_sockaddr (int len);
+ public void* 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);
@@ -312,23 +312,23 @@
public void reserve ();
public virtual void send_request (Soup.Message req);
[NoAccessorMethod]
- public weak pointer async_context { get; construct; }
+ public weak void* async_context { get; construct; }
[NoAccessorMethod]
- public weak pointer message_filter { get; set; }
+ public weak void* message_filter { get; set; }
[NoAccessorMethod]
- public weak pointer origin_uri { get; construct; }
+ public weak void* origin_uri { get; construct; }
[NoAccessorMethod]
- public weak pointer proxy_uri { get; construct; }
+ public weak void* proxy_uri { get; construct; }
[NoAccessorMethod]
- public weak pointer ssl_creds { get; construct; }
+ public weak void* ssl_creds { get; construct; }
[NoAccessorMethod]
public weak uint timeout { get; set; }
[HasEmitter]
- public signal void authenticate (Soup.Message p0, string auth_type, string auth_realm, pointer username, pointer password);
+ public signal void authenticate (Soup.Message p0, string auth_type, string auth_realm, void* username, void* password);
public signal void connect_result (int p0);
public signal void disconnected ();
[HasEmitter]
- public signal void reauthenticate (Soup.Message p0, string auth_type, string auth_realm, pointer username, pointer password);
+ public signal void reauthenticate (Soup.Message p0, string auth_type, string auth_realm, void* username, void* password);
}
[CCode (cheader_filename = "libsoup/soup.h")]
public class Message : GLib.Object {
@@ -396,7 +396,7 @@
}
[CCode (cheader_filename = "libsoup/soup.h")]
public class Server : GLib.Object {
- public void add_handler (string path, Soup.ServerAuthContext auth_ctx, Soup.ServerCallbackFn callback, Soup.ServerUnregisterFn unreg, pointer data);
+ public void add_handler (string path, Soup.ServerAuthContext auth_ctx, Soup.ServerCallbackFn callback, Soup.ServerUnregisterFn unreg, void* data);
public weak GLib.MainContext get_async_context ();
public weak Soup.ServerHandler get_handler (string path);
public weak Soup.Socket get_listener ();
@@ -409,7 +409,7 @@
public void run ();
public void run_async ();
[NoAccessorMethod]
- public weak pointer async_context { get; construct; }
+ public weak void* async_context { get; construct; }
[NoAccessorMethod]
public weak Soup.Address @interface { get; construct; }
[NoAccessorMethod]
@@ -444,21 +444,21 @@
public virtual void requeue_message (Soup.Message msg);
public virtual uint send_message (Soup.Message msg);
[NoAccessorMethod]
- public weak pointer async_context { get; construct; }
+ public weak void* async_context { get; construct; }
[NoAccessorMethod]
public weak int max_conns { get; set; }
[NoAccessorMethod]
public weak int max_conns_per_host { get; set; }
[NoAccessorMethod]
- public weak pointer proxy_uri { get; set; }
+ public weak void* proxy_uri { get; set; }
[NoAccessorMethod]
public weak string ssl_ca_file { get; set; }
[NoAccessorMethod]
public weak uint timeout { get; set; }
[NoAccessorMethod]
public weak bool use_ntlm { get; set; }
- public signal void authenticate (Soup.Message p0, string auth_type, string auth_realm, pointer username, pointer password);
- public signal void reauthenticate (Soup.Message p0, string auth_type, string auth_realm, pointer username, pointer password);
+ public signal void authenticate (Soup.Message p0, string auth_type, string auth_realm, void* username, void* password);
+ public signal void reauthenticate (Soup.Message p0, string auth_type, string auth_realm, void* username, void* password);
}
[CCode (cheader_filename = "libsoup/soup.h")]
public class SessionAsync : Soup.Session, Soup.MessageFilter {
@@ -472,8 +472,8 @@
}
[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);
- public static weak Soup.Socket client_new_sync (string hostname, uint port, pointer ssl_creds, uint status_ret);
+ public static weak Soup.Socket client_new_async (string hostname, uint port, void* ssl_creds, Soup.SocketCallback callback);
+ public static weak Soup.Socket client_new_sync (string hostname, uint port, void* ssl_creds, uint status_ret);
public uint connect (Soup.Address remote_addr);
public void disconnect ();
public weak Soup.Address get_local_address ();
@@ -481,14 +481,14 @@
public bool is_connected ();
public bool listen (Soup.Address local_addr);
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);
+ public Soup.SocketIOStatus read (void* buffer, ulong len, ulong nread);
+ public Soup.SocketIOStatus read_until (void* buffer, ulong len, void* boundary, ulong boundary_len, ulong nread, bool got_boundary);
+ public static weak Soup.Socket server_new (Soup.Address local_addr, void* 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);
+ public Soup.SocketIOStatus write (void* buffer, ulong len, ulong nwrote);
[NoAccessorMethod]
- public weak pointer async_context { get; construct; }
+ public weak void* async_context { get; construct; }
[NoAccessorMethod]
public weak bool cloexec { get; set; }
[NoAccessorMethod]
@@ -500,7 +500,7 @@
[NoAccessorMethod]
public weak bool reuseaddr { get; set; }
[NoAccessorMethod]
- public weak pointer ssl_creds { get; set; }
+ public weak void* ssl_creds { get; set; }
[NoAccessorMethod]
public weak uint timeout { get; set; }
public signal void connect_result (int p0);
@@ -608,9 +608,9 @@
public const int TYPES_H;
public const int URI_H;
[CCode (cheader_filename = "libsoup/soup.h")]
- public static weak GLib.Source add_idle (GLib.MainContext async_context, GLib.SourceFunc function, pointer data);
+ public static weak GLib.TimeoutSource add_idle (GLib.MainContext async_context, GLib.SourceFunc function, void* data);
[CCode (cheader_filename = "libsoup/soup.h")]
- public static weak GLib.Source add_timeout (GLib.MainContext async_context, uint interval, GLib.SourceFunc function, pointer data);
+ public static weak GLib.TimeoutSource add_timeout (GLib.MainContext async_context, uint interval, GLib.SourceFunc function, void* data);
[CCode (cheader_filename = "libsoup/soup.h")]
public static weak string base64_decode (string text, int out_len);
[CCode (cheader_filename = "libsoup/soup.h")]
@@ -628,7 +628,7 @@
[CCode (cheader_filename = "libsoup/soup.h")]
public static ulong date_parse (string timestamp);
[CCode (cheader_filename = "libsoup/soup.h")]
- public static void gmtime (ulong when, pointer tm);
+ public static void gmtime (ulong when, void* tm);
[CCode (cheader_filename = "libsoup/soup.h")]
public static weak string header_param_copy_token (GLib.HashTable tokens, string t);
[CCode (cheader_filename = "libsoup/soup.h")]
@@ -646,11 +646,11 @@
[CCode (cheader_filename = "libsoup/soup.h")]
public static Soup.MethodId method_get_id (string method);
[CCode (cheader_filename = "libsoup/soup.h")]
- public static uint signal_connect_once (pointer instance, string detailed_signal, GLib.Callback c_handler, pointer data);
+ public static uint signal_connect_once (void* instance, string detailed_signal, GLib.Callback c_handler, void* data);
[CCode (cheader_filename = "libsoup/soup.h")]
public static weak string status_get_phrase (uint status_code);
[CCode (cheader_filename = "libsoup/soup.h")]
- public static bool str_case_equal (pointer v1, pointer v2);
+ public static bool str_case_equal (void* v1, void* v2);
[CCode (cheader_filename = "libsoup/soup.h")]
- public static uint str_case_hash (pointer key);
+ public static uint str_case_hash (void* key);
}
Modified: trunk/vapi/libsoup-2.4.vapi
==============================================================================
--- trunk/vapi/libsoup-2.4.vapi (original)
+++ trunk/vapi/libsoup-2.4.vapi Sat Apr 19 16:06:52 2008
@@ -2,13 +2,13 @@
[CCode (cprefix = "Soup", lower_case_cprefix = "soup_")]
namespace Soup {
- [CCode (cprefix = "SOUP_ADDRESS_FAMILY_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_ADDRESS_FAMILY_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
public enum AddressFamily {
INVALID,
IPV4,
- IPV6,
+ IPV6
}
- [CCode (cprefix = "SOUP_DATE_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_DATE_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
public enum DateFormat {
HTTP,
COOKIE,
@@ -16,23 +16,23 @@
ISO8601_COMPACT,
ISO8601_FULL,
ISO8601,
- ISO8601_XMLRPC,
+ ISO8601_XMLRPC
}
- [CCode (cprefix = "SOUP_ENCODING_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_ENCODING_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
public enum Encoding {
UNRECOGNIZED,
NONE,
CONTENT_LENGTH,
EOF,
CHUNKED,
- BYTERANGES,
+ BYTERANGES
}
- [CCode (cprefix = "SOUP_HTTP_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_HTTP_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
public enum HTTPVersion {
1_0,
- 1_1,
+ 1_1
}
- [CCode (cprefix = "SOUP_STATUS_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_STATUS_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
public enum KnownStatusCode {
NONE,
CANCELLED,
@@ -94,46 +94,46 @@
GATEWAY_TIMEOUT,
HTTP_VERSION_NOT_SUPPORTED,
INSUFFICIENT_STORAGE,
- NOT_EXTENDED,
+ NOT_EXTENDED
}
- [CCode (cprefix = "SOUP_LOGGER_LOG_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_LOGGER_LOG_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
public enum LoggerLogLevel {
NONE,
MINIMAL,
HEADERS,
- BODY,
+ BODY
}
- [CCode (cprefix = "SOUP_MEMORY_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_MEMORY_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
public enum MemoryUse {
STATIC,
TAKE,
COPY,
- TEMPORARY,
+ TEMPORARY
}
- [CCode (cprefix = "SOUP_MESSAGE_HEADERS_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_MESSAGE_HEADERS_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
public enum MessageHeadersType {
REQUEST,
- RESPONSE,
+ RESPONSE
}
- [CCode (cprefix = "SOUP_SSL_ERROR_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_SSL_ERROR_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
public enum SSLError {
HANDSHAKE_NEEDS_READ,
HANDSHAKE_NEEDS_WRITE,
- CERTIFICATE,
+ CERTIFICATE
}
- [CCode (cprefix = "SOUP_SOCKET_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_SOCKET_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
public enum SocketIOStatus {
OK,
WOULD_BLOCK,
EOF,
- ERROR,
+ ERROR
}
- [CCode (cprefix = "SOUP_XMLRPC_ERROR_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_XMLRPC_ERROR_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
public enum XMLRPCError {
ARGUMENTS,
- RETVAL,
+ RETVAL
}
- [CCode (cprefix = "SOUP_XMLRPC_FAULT_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_XMLRPC_FAULT_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
public enum XMLRPCFault {
PARSE_ERROR_NOT_WELL_FORMED,
PARSE_ERROR_UNSUPPORTED_ENCODING,
@@ -144,24 +144,23 @@
SERVER_ERROR_INTERNAL_XML_RPC_ERROR,
APPLICATION_ERROR,
SYSTEM_ERROR,
- TRANSPORT_ERROR,
+ TRANSPORT_ERROR
}
- [CCode (cprefix = "SOUP_EXPECTATION_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_EXPECTATION_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
[Flags]
public enum Expectation {
UNRECOGNIZED,
- CONTINUE,
+ CONTINUE
}
- [CCode (cprefix = "SOUP_MESSAGE_", cheader_filename = "libsoup/soup.h")]
+ [CCode (cprefix = "SOUP_MESSAGE_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
[Flags]
public enum MessageFlags {
NO_REDIRECT,
- OVERWRITE_CHUNKS,
+ OVERWRITE_CHUNKS
}
[CCode (cheader_filename = "libsoup/soup.h")]
public class MessageHeadersIter {
- [NoArrayLength]
- public weak pointer[] dummy;
+ public void* dummy;
public void init (Soup.MessageHeaders hdrs);
public bool next (out weak string name, out weak string value);
}
@@ -170,10 +169,10 @@
public weak string data;
public ulong length;
public weak Soup.Buffer copy ();
- public pointer get_owner ();
- public Buffer (Soup.MemoryUse use, pointer data, ulong length);
+ public void* get_owner ();
+ public Buffer (Soup.MemoryUse use, void* data, ulong length);
public Buffer.subbuffer (Soup.Buffer parent, ulong offset, ulong length);
- public Buffer.with_owner (pointer data, ulong length, pointer owner, GLib.DestroyNotify owner_dnotify);
+ public Buffer.with_owner (void* data, ulong length, void* owner, GLib.DestroyNotify owner_dnotify);
}
[CCode (cheader_filename = "libsoup/soup.h")]
public class ByteArray : GLib.Boxed {
@@ -208,7 +207,7 @@
public class MessageBody : GLib.Boxed {
public weak string data;
public int64 length;
- public void append (Soup.MemoryUse use, pointer data, ulong length);
+ public void append (Soup.MemoryUse use, void* data, ulong length);
public void append_buffer (Soup.Buffer buffer);
public void complete ();
public weak Soup.Buffer flatten ();
@@ -267,10 +266,10 @@
public weak string get_name ();
public weak string get_physical ();
public uint get_port ();
- public pointer get_sockaddr (int len);
+ public void* get_sockaddr (int len);
public Address (string name, uint port);
public Address.any (Soup.AddressFamily family, uint port);
- public Address.from_sockaddr (pointer sa, int len);
+ public Address.from_sockaddr (void* sa, int len);
public void resolve_async (GLib.MainContext async_context, GLib.Cancellable cancellable, Soup.AddressCallback callback);
public uint resolve_sync (GLib.Cancellable cancellable);
[NoAccessorMethod]
@@ -281,7 +280,7 @@
[NoAccessorMethod]
public weak int port { get; construct; }
[NoAccessorMethod]
- public weak pointer sockaddr { get; construct; }
+ public weak void* sockaddr { get; construct; }
}
[CCode (cheader_filename = "libsoup/soup.h")]
public class Auth : GLib.Object {
@@ -311,20 +310,20 @@
public bool covers (Soup.Message msg);
public weak string get_realm ();
public void remove_path (string path);
- public void set_filter (Soup.AuthDomainFilter filter, pointer filter_data, GLib.DestroyNotify dnotify);
- public void set_generic_auth_callback (Soup.AuthDomainGenericAuthCallback auth_callback, pointer auth_data, GLib.DestroyNotify dnotify);
+ public void set_filter (Soup.AuthDomainFilter filter, void* filter_data, GLib.DestroyNotify dnotify);
+ public void set_generic_auth_callback (Soup.AuthDomainGenericAuthCallback auth_callback, void* auth_data, GLib.DestroyNotify dnotify);
public bool try_generic_auth_callback (Soup.Message msg, string username);
public virtual weak string accepts (Soup.Message msg);
public virtual weak string challenge (Soup.Message msg);
public virtual bool check_password (Soup.Message msg, string username, string password);
[NoAccessorMethod]
- public weak pointer filter { get; set; }
+ public weak void* filter { get; set; }
[NoAccessorMethod]
- public weak pointer filter_data { get; set; }
+ public weak void* filter_data { get; set; }
[NoAccessorMethod]
- public weak pointer generic_auth_callback { get; set; }
+ public weak void* generic_auth_callback { get; set; }
[NoAccessorMethod]
- public weak pointer generic_auth_data { get; set; }
+ public weak void* generic_auth_data { get; set; }
[NoAccessorMethod]
public weak bool proxy { get; construct; }
[NoAccessorMethod]
@@ -335,9 +334,9 @@
public AuthDomainBasic (string optname1);
public static void set_auth_callback (Soup.AuthDomain domain, Soup.AuthDomainBasicAuthCallback callback, GLib.DestroyNotify dnotify);
[NoAccessorMethod]
- public weak pointer auth_callback { get; set; }
+ public weak void* auth_callback { get; set; }
[NoAccessorMethod]
- public weak pointer auth_data { get; set; }
+ public weak void* auth_data { get; set; }
}
[CCode (cheader_filename = "libsoup/soup.h")]
public class AuthDomainDigest : Soup.AuthDomain {
@@ -345,18 +344,18 @@
public AuthDomainDigest (string optname1);
public static void set_auth_callback (Soup.AuthDomain domain, Soup.AuthDomainDigestAuthCallback callback, GLib.DestroyNotify dnotify);
[NoAccessorMethod]
- public weak pointer auth_callback { get; set; }
+ public weak void* auth_callback { get; set; }
[NoAccessorMethod]
- public weak pointer auth_data { get; set; }
+ public weak void* auth_data { get; set; }
}
[CCode (cheader_filename = "libsoup/soup.h")]
public class Logger : GLib.Object {
public void attach (Soup.Session session);
public void detach (Soup.Session session);
public Logger (Soup.LoggerLogLevel level, int max_body_size);
- public void set_printer (Soup.LoggerPrinter printer, pointer printer_data, GLib.DestroyNotify destroy);
- public void set_request_filter (Soup.LoggerFilter request_filter, pointer filter_data, GLib.DestroyNotify destroy);
- public void set_response_filter (Soup.LoggerFilter response_filter, pointer filter_data, GLib.DestroyNotify destroy);
+ public void set_printer (Soup.LoggerPrinter printer, void* printer_data, GLib.DestroyNotify destroy);
+ public void set_request_filter (Soup.LoggerFilter request_filter, void* filter_data, GLib.DestroyNotify destroy);
+ public void set_response_filter (Soup.LoggerFilter response_filter, void* filter_data, GLib.DestroyNotify destroy);
}
[CCode (cheader_filename = "libsoup/soup.h")]
public class Message : GLib.Object {
@@ -427,7 +426,7 @@
public void run_async ();
public void unpause_message (Soup.Message msg);
[NoAccessorMethod]
- public weak pointer async_context { get; construct; }
+ public weak void* async_context { get; construct; }
[NoAccessorMethod]
public weak Soup.Address @interface { get; construct; }
[NoAccessorMethod]
@@ -456,7 +455,7 @@
public virtual void requeue_message (Soup.Message msg);
public virtual uint send_message (Soup.Message msg);
[NoAccessorMethod]
- public weak pointer async_context { get; construct; }
+ public weak void* async_context { get; construct; }
[NoAccessorMethod]
public weak int max_conns { get; set; }
[NoAccessorMethod]
@@ -495,13 +494,13 @@
public bool is_ssl ();
public bool listen ();
public Socket (string optname1);
- public Soup.SocketIOStatus read (pointer buffer, ulong len, ulong nread, GLib.Cancellable cancellable) throws GLib.Error;
- public Soup.SocketIOStatus read_until (pointer buffer, ulong len, pointer boundary, ulong boundary_len, ulong nread, bool got_boundary, GLib.Cancellable cancellable) throws GLib.Error;
+ public Soup.SocketIOStatus read (void* buffer, ulong len, ulong nread, GLib.Cancellable cancellable) throws GLib.Error;
+ public Soup.SocketIOStatus read_until (void* buffer, ulong len, void* boundary, ulong boundary_len, ulong nread, bool got_boundary, GLib.Cancellable cancellable) throws GLib.Error;
public bool start_proxy_ssl (string ssl_host, GLib.Cancellable cancellable);
public bool start_ssl (GLib.Cancellable cancellable);
- public Soup.SocketIOStatus write (pointer buffer, ulong len, ulong nwrote, GLib.Cancellable cancellable) throws GLib.Error;
+ public Soup.SocketIOStatus write (void* buffer, ulong len, ulong nwrote, GLib.Cancellable cancellable) throws GLib.Error;
[NoAccessorMethod]
- public weak pointer async_context { get; construct; }
+ public weak void* async_context { get; construct; }
[NoAccessorMethod]
public weak bool is_server { get; }
[NoAccessorMethod]
@@ -511,7 +510,7 @@
[NoAccessorMethod]
public weak Soup.Address remote_address { get; construct; }
[NoAccessorMethod]
- public weak pointer ssl_creds { get; set; }
+ public weak void* ssl_creds { get; set; }
[NoAccessorMethod]
public weak uint timeout { get; set; }
public signal void disconnected ();
@@ -620,23 +619,23 @@
public const int VALUE_UTILS_H;
public const int XMLRPC_H;
[CCode (cheader_filename = "libsoup/soup.h")]
- public static weak GLib.Source add_idle (GLib.MainContext async_context, GLib.SourceFunc function, pointer data);
+ public static weak GLib.TimeoutSource add_idle (GLib.MainContext async_context, GLib.SourceFunc function, void* data);
[CCode (cheader_filename = "libsoup/soup.h")]
- public static weak GLib.Source add_timeout (GLib.MainContext async_context, uint interval, GLib.SourceFunc function, pointer data);
+ public static weak GLib.TimeoutSource add_timeout (GLib.MainContext async_context, uint interval, GLib.SourceFunc function, void* data);
[CCode (cheader_filename = "libsoup/soup.h")]
public static weak GLib.HashTable form_decode (string encoded_form);
[CCode (cheader_filename = "libsoup/soup.h")]
public static weak string form_encode (...);
[CCode (cheader_filename = "libsoup/soup.h")]
- public static weak string form_encode_datalist (out weak GLib.Data form_data_set);
+ public static weak string form_encode_datalist (void* form_data_set);
[CCode (cheader_filename = "libsoup/soup.h")]
public static weak string form_encode_hash (GLib.HashTable form_data_set);
[CCode (cheader_filename = "libsoup/soup.h")]
- public static weak string form_encode_valist (string first_field, pointer args);
+ public static weak string form_encode_valist (string first_field, void* args);
[CCode (cheader_filename = "libsoup/soup.h")]
public static weak Soup.Message form_request_new (string method, string uri, ...);
[CCode (cheader_filename = "libsoup/soup.h")]
- public static weak Soup.Message form_request_new_from_datalist (string method, string uri, out weak GLib.Data form_data_set);
+ public static weak Soup.Message form_request_new_from_datalist (string method, string uri, void* form_data_set);
[CCode (cheader_filename = "libsoup/soup.h")]
public static weak Soup.Message form_request_new_from_hash (string method, string uri, GLib.HashTable form_data_set);
[CCode (cheader_filename = "libsoup/soup.h")]
@@ -664,15 +663,15 @@
[CCode (cheader_filename = "libsoup/soup.h")]
public static weak string status_get_phrase (uint status_code);
[CCode (cheader_filename = "libsoup/soup.h")]
- public static bool str_case_equal (pointer v1, pointer v2);
+ public static bool str_case_equal (void* v1, void* v2);
[CCode (cheader_filename = "libsoup/soup.h")]
- public static uint str_case_hash (pointer key);
+ public static uint str_case_hash (void* key);
[CCode (cheader_filename = "libsoup/soup.h")]
public static void value_array_append (GLib.ValueArray array, GLib.Type type);
[CCode (cheader_filename = "libsoup/soup.h")]
public static void value_array_append_vals (GLib.ValueArray array, ...);
[CCode (cheader_filename = "libsoup/soup.h")]
- public static GLib.ValueArray value_array_from_args (pointer args);
+ public static GLib.ValueArray value_array_from_args (void* args);
[CCode (cheader_filename = "libsoup/soup.h")]
public static bool value_array_get_nth (GLib.ValueArray array, uint index_, GLib.Type type);
[CCode (cheader_filename = "libsoup/soup.h")]
@@ -682,7 +681,7 @@
[CCode (cheader_filename = "libsoup/soup.h")]
public static GLib.ValueArray value_array_new_with_vals (...);
[CCode (cheader_filename = "libsoup/soup.h")]
- public static bool value_array_to_args (GLib.ValueArray array, pointer args);
+ public static bool value_array_to_args (GLib.ValueArray array, void* args);
[CCode (cheader_filename = "libsoup/soup.h")]
public static void value_hash_insert (GLib.HashTable hash, string key, GLib.Type type);
[CCode (cheader_filename = "libsoup/soup.h")]
Modified: trunk/vapi/libwnck-1.0.vapi
==============================================================================
--- trunk/vapi/libwnck-1.0.vapi (original)
+++ trunk/vapi/libwnck-1.0.vapi Sat Apr 19 16:06:52 2008
@@ -2,30 +2,30 @@
[CCode (cprefix = "Wnck", lower_case_cprefix = "wnck_")]
namespace Wnck {
- [CCode (cprefix = "WNCK_CLIENT_TYPE_", cheader_filename = "libwnck/libwnck.h")]
+ [CCode (cprefix = "WNCK_CLIENT_TYPE_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
public enum ClientType {
APPLICATION,
- PAGER,
+ PAGER
}
- [CCode (cprefix = "WNCK_MOTION_", cheader_filename = "libwnck/libwnck.h")]
+ [CCode (cprefix = "WNCK_MOTION_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
public enum MotionDirection {
UP,
DOWN,
LEFT,
- RIGHT,
+ RIGHT
}
- [CCode (cprefix = "WNCK_PAGER_DISPLAY_", cheader_filename = "libwnck/libwnck.h")]
+ [CCode (cprefix = "WNCK_PAGER_DISPLAY_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
public enum PagerDisplayMode {
NAME,
- CONTENT,
+ CONTENT
}
- [CCode (cprefix = "WNCK_TASKLIST_", cheader_filename = "libwnck/libwnck.h")]
+ [CCode (cprefix = "WNCK_TASKLIST_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
public enum TasklistGroupingType {
NEVER_GROUP,
AUTO_GROUP,
- ALWAYS_GROUP,
+ ALWAYS_GROUP
}
- [CCode (cprefix = "WNCK_WINDOW_GRAVITY_", cheader_filename = "libwnck/libwnck.h")]
+ [CCode (cprefix = "WNCK_WINDOW_GRAVITY_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
public enum WindowGravity {
CURRENT,
NORTHWEST,
@@ -37,9 +37,9 @@
SOUTHWEST,
SOUTH,
SOUTHEAST,
- STATIC,
+ STATIC
}
- [CCode (cprefix = "WNCK_WINDOW_", cheader_filename = "libwnck/libwnck.h")]
+ [CCode (cprefix = "WNCK_WINDOW_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
public enum WindowType {
NORMAL,
DESKTOP,
@@ -48,9 +48,9 @@
TOOLBAR,
MENU,
UTILITY,
- SPLASHSCREEN,
+ SPLASHSCREEN
}
- [CCode (cprefix = "WNCK_WINDOW_ACTION_", cheader_filename = "libwnck/libwnck.h")]
+ [CCode (cprefix = "WNCK_WINDOW_ACTION_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
[Flags]
public enum WindowActions {
MOVE,
@@ -71,17 +71,17 @@
UNMAXIMIZE,
FULLSCREEN,
ABOVE,
- BELOW,
+ BELOW
}
- [CCode (cprefix = "WNCK_WINDOW_CHANGE_", cheader_filename = "libwnck/libwnck.h")]
+ [CCode (cprefix = "WNCK_WINDOW_CHANGE_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
[Flags]
public enum WindowMoveResizeMask {
X,
Y,
WIDTH,
- HEIGHT,
+ HEIGHT
}
- [CCode (cprefix = "WNCK_WINDOW_STATE_", cheader_filename = "libwnck/libwnck.h")]
+ [CCode (cprefix = "WNCK_WINDOW_STATE_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
[Flags]
public enum WindowState {
MINIMIZED,
@@ -96,7 +96,7 @@
DEMANDS_ATTENTION,
URGENT,
ABOVE,
- BELOW,
+ BELOW
}
[CCode (cheader_filename = "libwnck/libwnck.h")]
public class ResourceUsage {
@@ -143,7 +143,7 @@
[NoWrapper]
public virtual void pad4 ();
[NoAccessorMethod]
- public weak pointer window { get; construct; }
+ public weak void* window { get; construct; }
}
[CCode (cheader_filename = "libwnck/libwnck.h")]
public class Application : GLib.Object {
@@ -283,7 +283,7 @@
public void set_button_relief (Gtk.ReliefStyle relief);
public void set_grouping (Wnck.TasklistGroupingType grouping);
public void set_grouping_limit (int limit);
- public void set_icon_loader (Wnck.LoadIconFunction load_icon_func, pointer data, GLib.DestroyNotify free_data_func);
+ public void set_icon_loader (Wnck.LoadIconFunction load_icon_func, void* data, GLib.DestroyNotify free_data_func);
public void set_include_all_workspaces (bool include_all_workspaces);
public void set_minimum_height (int size);
public void set_minimum_width (int size);
Modified: trunk/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
==============================================================================
--- trunk/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala (original)
+++ trunk/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala Sat Apr 19 16:06:52 2008
@@ -48,7 +48,7 @@
public interface FileChooserEmbed {
}
- public static delegate void CallbackMarshal (Object object, pointer data, Arg[] args);
+ public static delegate void CallbackMarshal (Object object, void* data, Arg[] args);
public delegate void ActionCallback (Action action);
Modified: trunk/vapi/packages/libsoup-2.4/libsoup-2.4.metadata
==============================================================================
--- trunk/vapi/packages/libsoup-2.4/libsoup-2.4.metadata (original)
+++ trunk/vapi/packages/libsoup-2.4/libsoup-2.4.metadata Sat Apr 19 16:06:52 2008
@@ -17,3 +17,6 @@
soup_server_new ellipsis="1"
soup_session_queue_message.msg transfer_ownership="1"
+# unsupported
+GData name="pointer"
+
Modified: trunk/vapi/packages/pango/pango-custom.vala
==============================================================================
--- trunk/vapi/packages/pango/pango-custom.vala (original)
+++ trunk/vapi/packages/pango/pango-custom.vala Sat Apr 19 16:06:52 2008
@@ -22,7 +22,7 @@
namespace Pango {
public class Language {
- [Import ()]
- public weak string! to_string ();
+ [Import]
+ public weak string to_string ();
}
}
Modified: trunk/vapi/pango.vapi
==============================================================================
--- trunk/vapi/pango.vapi (original)
+++ trunk/vapi/pango.vapi Sat Apr 19 16:06:52 2008
@@ -2,13 +2,13 @@
[CCode (cprefix = "Pango", lower_case_cprefix = "pango_")]
namespace Pango {
- [CCode (cprefix = "PANGO_ALIGN_", cheader_filename = "pango/pango.h")]
+ [CCode (cprefix = "PANGO_ALIGN_", has_type_id = "0", cheader_filename = "pango/pango.h")]
public enum Alignment {
LEFT,
CENTER,
- RIGHT,
+ RIGHT
}
- [CCode (cprefix = "PANGO_ATTR_", cheader_filename = "pango/pango.h")]
+ [CCode (cprefix = "PANGO_ATTR_", has_type_id = "0", cheader_filename = "pango/pango.h")]
public enum AttrType {
INVALID,
LANGUAGE,
@@ -32,16 +32,16 @@
STRIKETHROUGH_COLOR,
ABSOLUTE_SIZE,
GRAVITY,
- GRAVITY_HINT,
+ GRAVITY_HINT
}
- [CCode (cprefix = "PANGO_COVERAGE_", cheader_filename = "pango/pango.h")]
+ [CCode (cprefix = "PANGO_COVERAGE_", has_type_id = "0", cheader_filename = "pango/pango.h")]
public enum CoverageLevel {
NONE,
FALLBACK,
APPROXIMATE,
- EXACT,
+ EXACT
}
- [CCode (cprefix = "PANGO_DIRECTION_", cheader_filename = "pango/pango.h")]
+ [CCode (cprefix = "PANGO_DIRECTION_", has_type_id = "0", cheader_filename = "pango/pango.h")]
public enum Direction {
LTR,
RTL,
@@ -49,37 +49,37 @@
TTB_RTL,
WEAK_LTR,
WEAK_RTL,
- NEUTRAL,
+ NEUTRAL
}
- [CCode (cprefix = "PANGO_ELLIPSIZE_", cheader_filename = "pango/pango.h")]
+ [CCode (cprefix = "PANGO_ELLIPSIZE_", has_type_id = "0", cheader_filename = "pango/pango.h")]
public enum EllipsizeMode {
NONE,
START,
MIDDLE,
- END,
+ END
}
- [CCode (cprefix = "PANGO_GRAVITY_", cheader_filename = "pango/pango.h")]
+ [CCode (cprefix = "PANGO_GRAVITY_", has_type_id = "0", cheader_filename = "pango/pango.h")]
public enum Gravity {
SOUTH,
EAST,
NORTH,
WEST,
- AUTO,
+ AUTO
}
- [CCode (cprefix = "PANGO_GRAVITY_HINT_", cheader_filename = "pango/pango.h")]
+ [CCode (cprefix = "PANGO_GRAVITY_HINT_", has_type_id = "0", cheader_filename = "pango/pango.h")]
public enum GravityHint {
NATURAL,
STRONG,
- LINE,
+ LINE
}
- [CCode (cprefix = "PANGO_RENDER_PART_", cheader_filename = "pango/pango.h")]
+ [CCode (cprefix = "PANGO_RENDER_PART_", has_type_id = "0", cheader_filename = "pango/pango.h")]
public enum RenderPart {
FOREGROUND,
BACKGROUND,
UNDERLINE,
- STRIKETHROUGH,
+ STRIKETHROUGH
}
- [CCode (cprefix = "PANGO_SCRIPT_", cheader_filename = "pango/pango.h")]
+ [CCode (cprefix = "PANGO_SCRIPT_", has_type_id = "0", cheader_filename = "pango/pango.h")]
public enum Script {
INVALID_CODE,
COMMON,
@@ -148,9 +148,9 @@
CUNEIFORM,
PHOENICIAN,
PHAGS_PA,
- NKO,
+ NKO
}
- [CCode (cprefix = "PANGO_STRETCH_", cheader_filename = "pango/pango.h")]
+ [CCode (cprefix = "PANGO_STRETCH_", has_type_id = "0", cheader_filename = "pango/pango.h")]
public enum Stretch {
ULTRA_CONDENSED,
EXTRA_CONDENSED,
@@ -160,32 +160,32 @@
SEMI_EXPANDED,
EXPANDED,
EXTRA_EXPANDED,
- ULTRA_EXPANDED,
+ ULTRA_EXPANDED
}
- [CCode (cprefix = "PANGO_STYLE_", cheader_filename = "pango/pango.h")]
+ [CCode (cprefix = "PANGO_STYLE_", has_type_id = "0", cheader_filename = "pango/pango.h")]
public enum Style {
NORMAL,
OBLIQUE,
- ITALIC,
+ ITALIC
}
- [CCode (cprefix = "PANGO_TAB_", cheader_filename = "pango/pango.h")]
+ [CCode (cprefix = "PANGO_TAB_", has_type_id = "0", cheader_filename = "pango/pango.h")]
public enum TabAlign {
- LEFT,
+ LEFT
}
- [CCode (cprefix = "PANGO_UNDERLINE_", cheader_filename = "pango/pango.h")]
+ [CCode (cprefix = "PANGO_UNDERLINE_", has_type_id = "0", cheader_filename = "pango/pango.h")]
public enum Underline {
NONE,
SINGLE,
DOUBLE,
LOW,
- ERROR,
+ ERROR
}
- [CCode (cprefix = "PANGO_VARIANT_", cheader_filename = "pango/pango.h")]
+ [CCode (cprefix = "PANGO_VARIANT_", has_type_id = "0", cheader_filename = "pango/pango.h")]
public enum Variant {
NORMAL,
- SMALL_CAPS,
+ SMALL_CAPS
}
- [CCode (cprefix = "PANGO_WEIGHT_", cheader_filename = "pango/pango.h")]
+ [CCode (cprefix = "PANGO_WEIGHT_", has_type_id = "0", cheader_filename = "pango/pango.h")]
public enum Weight {
ULTRALIGHT,
LIGHT,
@@ -193,15 +193,15 @@
SEMIBOLD,
BOLD,
ULTRABOLD,
- HEAVY,
+ HEAVY
}
- [CCode (cprefix = "PANGO_WRAP_", cheader_filename = "pango/pango.h")]
+ [CCode (cprefix = "PANGO_WRAP_", has_type_id = "0", cheader_filename = "pango/pango.h")]
public enum WrapMode {
WORD,
CHAR,
- WORD_CHAR,
+ WORD_CHAR
}
- [CCode (cprefix = "PANGO_FONT_MASK_", cheader_filename = "pango/pango.h")]
+ [CCode (cprefix = "PANGO_FONT_MASK_", has_type_id = "0", cheader_filename = "pango/pango.h")]
[Flags]
public enum FontMask {
FAMILY,
@@ -210,7 +210,7 @@
WEIGHT,
STRETCH,
SIZE,
- GRAVITY,
+ GRAVITY
}
[CCode (cheader_filename = "pango/pango.h")]
public class Language : GLib.Boxed {
@@ -282,11 +282,11 @@
public weak Pango.Attribute attr;
public Pango.Rectangle ink_rect;
public Pango.Rectangle logical_rect;
- public pointer data;
+ public void* data;
public Pango.AttrDataCopyFunc copy_func;
public GLib.DestroyNotify destroy_func;
public AttrShape (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect);
- public AttrShape.with_data (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect, pointer data, Pango.AttrDataCopyFunc copy_func, GLib.DestroyNotify destroy_func);
+ public AttrShape.with_data (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect, void* data, Pango.AttrDataCopyFunc copy_func, GLib.DestroyNotify destroy_func);
}
[CCode (cheader_filename = "pango/pango.h")]
public class AttrSize {
@@ -366,7 +366,7 @@
public class AttrList : GLib.Boxed {
public void change (Pango.Attribute attr);
public weak Pango.AttrList copy ();
- public weak Pango.AttrList filter (Pango.AttrFilterFunc func, pointer data);
+ public weak Pango.AttrList filter (Pango.AttrFilterFunc func, void* data);
public weak Pango.AttrIterator get_iterator ();
public void insert (Pango.Attribute attr);
public void insert_before (Pango.Attribute attr);
@@ -553,7 +553,7 @@
}
[CCode (cheader_filename = "pango/pango.h")]
public class Fontset : GLib.Object {
- public void @foreach (Pango.FontsetForeachFunc func, pointer data);
+ public void @foreach (Pango.FontsetForeachFunc func, void* data);
public weak Pango.Font get_font (uint wc);
public weak Pango.FontMetrics get_metrics ();
}
@@ -697,7 +697,7 @@
public void translate (double tx, double ty);
}
[CCode (cheader_filename = "pango/pango.h")]
- public delegate pointer AttrDataCopyFunc ();
+ public delegate void* AttrDataCopyFunc ();
[CCode (cheader_filename = "pango/pango.h")]
public delegate bool AttrFilterFunc (Pango.Attribute attribute);
[CCode (cheader_filename = "pango/pango.h")]
Modified: trunk/vapi/pangocairo.vapi
==============================================================================
--- trunk/vapi/pangocairo.vapi (original)
+++ trunk/vapi/pangocairo.vapi Sat Apr 19 16:06:52 2008
@@ -23,13 +23,13 @@
[CCode (cheader_filename = "pango/pangocairo.h")]
public static double cairo_context_get_resolution (Pango.Context context);
[CCode (cheader_filename = "pango/pangocairo.h")]
- public static Pango.CairoShapeRendererFunc cairo_context_get_shape_renderer (Pango.Context context, pointer data);
+ public static Pango.CairoShapeRendererFunc cairo_context_get_shape_renderer (Pango.Context context, void* data);
[CCode (cheader_filename = "pango/pangocairo.h")]
public static void cairo_context_set_font_options (Pango.Context context, Cairo.FontOptions options);
[CCode (cheader_filename = "pango/pangocairo.h")]
public static void cairo_context_set_resolution (Pango.Context context, double dpi);
[CCode (cheader_filename = "pango/pangocairo.h")]
- public static void cairo_context_set_shape_renderer (Pango.Context context, Pango.CairoShapeRendererFunc func, pointer data, GLib.DestroyNotify dnotify);
+ public static void cairo_context_set_shape_renderer (Pango.Context context, Pango.CairoShapeRendererFunc func, void* data, GLib.DestroyNotify dnotify);
[CCode (cheader_filename = "pango/pangocairo.h")]
public static weak Pango.Layout cairo_create_layout (Cairo.Context cr);
[CCode (cheader_filename = "pango/pangocairo.h")]
Modified: trunk/vapi/poppler-glib.vapi
==============================================================================
--- trunk/vapi/poppler-glib.vapi (original)
+++ trunk/vapi/poppler-glib.vapi Sat Apr 19 16:06:52 2008
@@ -2,7 +2,7 @@
[CCode (cprefix = "Poppler", lower_case_cprefix = "poppler_")]
namespace Poppler {
- [CCode (cprefix = "POPPLER_ACTION_", cheader_filename = "poppler.h")]
+ [CCode (cprefix = "POPPLER_ACTION_", has_type_id = "0", cheader_filename = "poppler.h")]
public enum ActionType {
UNKNOWN,
GOTO_DEST,
@@ -10,15 +10,15 @@
LAUNCH,
URI,
NAMED,
- MOVIE,
+ MOVIE
}
- [CCode (cprefix = "POPPLER_BACKEND_", cheader_filename = "poppler.h")]
+ [CCode (cprefix = "POPPLER_BACKEND_", has_type_id = "0", cheader_filename = "poppler.h")]
public enum Backend {
UNKNOWN,
SPLASH,
- CAIRO,
+ CAIRO
}
- [CCode (cprefix = "POPPLER_DEST_", cheader_filename = "poppler.h")]
+ [CCode (cprefix = "POPPLER_DEST_", has_type_id = "0", cheader_filename = "poppler.h")]
public enum DestType {
UNKNOWN,
XYZ,
@@ -29,14 +29,14 @@
FITB,
FITBH,
FITBV,
- NAMED,
+ NAMED
}
- [CCode (cprefix = "POPPLER_ERROR_", cheader_filename = "poppler.h")]
+ [CCode (cprefix = "POPPLER_ERROR_", has_type_id = "0", cheader_filename = "poppler.h")]
public enum Error {
INVALID,
- ENCRYPTED,
+ ENCRYPTED
}
- [CCode (cprefix = "POPPLER_FONT_TYPE_", cheader_filename = "poppler.h")]
+ [CCode (cprefix = "POPPLER_FONT_TYPE_", has_type_id = "0", cheader_filename = "poppler.h")]
public enum FontType {
UNKNOWN,
TYPE1,
@@ -49,41 +49,41 @@
CID_TYPE0C,
CID_TYPE0COT,
CID_TYPE2,
- CID_TYPE2OT,
+ CID_TYPE2OT
}
- [CCode (cprefix = "POPPLER_FORM_BUTTON_", cheader_filename = "poppler.h")]
+ [CCode (cprefix = "POPPLER_FORM_BUTTON_", has_type_id = "0", cheader_filename = "poppler.h")]
public enum FormButtonType {
PUSH,
CHECK,
- RADIO,
+ RADIO
}
- [CCode (cprefix = "POPPLER_FORM_CHOICE_", cheader_filename = "poppler.h")]
+ [CCode (cprefix = "POPPLER_FORM_CHOICE_", has_type_id = "0", cheader_filename = "poppler.h")]
public enum FormChoiceType {
COMBO,
- LIST,
+ LIST
}
- [CCode (cprefix = "POPPLER_FORM_FIELD_", cheader_filename = "poppler.h")]
+ [CCode (cprefix = "POPPLER_FORM_FIELD_", has_type_id = "0", cheader_filename = "poppler.h")]
public enum FormFieldType {
UNKNOWN,
BUTTON,
TEXT,
CHOICE,
- SIGNATURE,
+ SIGNATURE
}
- [CCode (cprefix = "POPPLER_FORM_TEXT_", cheader_filename = "poppler.h")]
+ [CCode (cprefix = "POPPLER_FORM_TEXT_", has_type_id = "0", cheader_filename = "poppler.h")]
public enum FormTextType {
NORMAL,
MULTILINE,
- FILE_SELECT,
+ FILE_SELECT
}
- [CCode (cprefix = "POPPLER_ORIENTATION_", cheader_filename = "poppler.h")]
+ [CCode (cprefix = "POPPLER_ORIENTATION_", has_type_id = "0", cheader_filename = "poppler.h")]
public enum Orientation {
PORTRAIT,
LANDSCAPE,
UPSIDEDOWN,
- SEASCAPE,
+ SEASCAPE
}
- [CCode (cprefix = "POPPLER_PAGE_LAYOUT_", cheader_filename = "poppler.h")]
+ [CCode (cprefix = "POPPLER_PAGE_LAYOUT_", has_type_id = "0", cheader_filename = "poppler.h")]
public enum PageLayout {
UNSET,
SINGLE_PAGE,
@@ -91,9 +91,9 @@
TWO_COLUMN_LEFT,
TWO_COLUMN_RIGHT,
TWO_PAGE_LEFT,
- TWO_PAGE_RIGHT,
+ TWO_PAGE_RIGHT
}
- [CCode (cprefix = "POPPLER_PAGE_MODE_", cheader_filename = "poppler.h")]
+ [CCode (cprefix = "POPPLER_PAGE_MODE_", has_type_id = "0", cheader_filename = "poppler.h")]
public enum PageMode {
UNSET,
NONE,
@@ -101,19 +101,19 @@
USE_THUMBS,
FULL_SCREEN,
USE_OC,
- USE_ATTACHMENTS,
+ USE_ATTACHMENTS
}
- [CCode (cprefix = "POPPLER_PAGE_TRANSITION_", cheader_filename = "poppler.h")]
+ [CCode (cprefix = "POPPLER_PAGE_TRANSITION_", has_type_id = "0", cheader_filename = "poppler.h")]
public enum PageTransitionAlignment {
HORIZONTAL,
- VERTICAL,
+ VERTICAL
}
- [CCode (cprefix = "POPPLER_PAGE_TRANSITION_", cheader_filename = "poppler.h")]
+ [CCode (cprefix = "POPPLER_PAGE_TRANSITION_", has_type_id = "0", cheader_filename = "poppler.h")]
public enum PageTransitionDirection {
INWARD,
- OUTWARD,
+ OUTWARD
}
- [CCode (cprefix = "POPPLER_PAGE_TRANSITION_", cheader_filename = "poppler.h")]
+ [CCode (cprefix = "POPPLER_PAGE_TRANSITION_", has_type_id = "0", cheader_filename = "poppler.h")]
public enum PageTransitionType {
REPLACE,
SPLIT,
@@ -126,24 +126,24 @@
PUSH,
COVER,
UNCOVER,
- FADE,
+ FADE
}
- [CCode (cprefix = "POPPLER_SELECTION_", cheader_filename = "poppler.h")]
+ [CCode (cprefix = "POPPLER_SELECTION_", has_type_id = "0", cheader_filename = "poppler.h")]
public enum SelectionStyle {
GLYPH,
WORD,
- LINE,
+ LINE
}
- [CCode (cprefix = "POPPLER_PERMISSIONS_", cheader_filename = "poppler.h")]
+ [CCode (cprefix = "POPPLER_PERMISSIONS_", has_type_id = "0", cheader_filename = "poppler.h")]
[Flags]
public enum Permissions {
OK_TO_PRINT,
OK_TO_MODIFY,
OK_TO_COPY,
OK_TO_ADD_NOTES,
- FULL,
+ FULL
}
- [CCode (cprefix = "POPPLER_VIEWER_PREFERENCES_", cheader_filename = "poppler.h")]
+ [CCode (cprefix = "POPPLER_VIEWER_PREFERENCES_", has_type_id = "0", cheader_filename = "poppler.h")]
[Flags]
public enum ViewerPreferences {
UNSET,
@@ -153,7 +153,7 @@
FIT_WINDOW,
CENTER_WINDOW,
DISPLAY_DOC_TITLE,
- DIRECTION_RTL,
+ DIRECTION_RTL
}
[CCode (cheader_filename = "poppler.h")]
public class ActionAny {
@@ -411,7 +411,7 @@
public weak string label { get; }
}
[CCode (cheader_filename = "poppler.h")]
- public static delegate bool AttachmentSaveFunc (string buf, ulong count, pointer data, GLib.Error error);
+ public static delegate bool AttachmentSaveFunc (string buf, ulong count, void* data, GLib.Error error);
public const int HAS_CAIRO;
[CCode (cheader_filename = "poppler.h")]
public static GLib.Quark error_quark ();
Modified: trunk/vapi/vte.vapi
==============================================================================
--- trunk/vapi/vte.vapi (original)
+++ trunk/vapi/vte.vapi Sat Apr 19 16:06:52 2008
@@ -2,18 +2,18 @@
[CCode (cprefix = "Vte", lower_case_cprefix = "vte_")]
namespace Vte {
- [CCode (cprefix = "VTE_ANTI_ALIAS_", cheader_filename = "vte/vte.h")]
+ [CCode (cprefix = "VTE_ANTI_ALIAS_", has_type_id = "0", cheader_filename = "vte/vte.h")]
public enum TerminalAntiAlias {
USE_DEFAULT,
FORCE_ENABLE,
- FORCE_DISABLE,
+ FORCE_DISABLE
}
- [CCode (cprefix = "VTE_ERASE_", cheader_filename = "vte/vte.h")]
+ [CCode (cprefix = "VTE_ERASE_", has_type_id = "0", cheader_filename = "vte/vte.h")]
public enum TerminalEraseBinding {
AUTO,
ASCII_BACKSPACE,
ASCII_DELETE,
- DELETE_SEQUENCE,
+ DELETE_SEQUENCE
}
[CCode (cheader_filename = "vte/vte.h")]
public class CharAttributes {
@@ -28,7 +28,7 @@
public class Reaper : GLib.Object {
public weak GLib.IOChannel channel;
[NoArrayLength]
- public weak int[] iopipe;
+ public int[] iopipe;
public static int add_child (GLib.Pid pid);
public static weak Vte.Reaper get ();
public signal void child_exited (int p0, int p1);
@@ -69,9 +69,9 @@
public void get_padding (int xpad, int ypad);
public long get_row_count ();
public weak string get_status_line ();
- public weak string get_text (GLib.Callback is_selected, pointer data, GLib.Array attributes);
- public weak string get_text_include_trailing_spaces (GLib.Callback is_selected, pointer data, GLib.Array attributes);
- public weak string get_text_range (long start_row, long start_col, long end_row, long end_col, GLib.Callback is_selected, pointer data, GLib.Array attributes);
+ public weak string get_text (GLib.Callback is_selected, void* data, GLib.Array attributes);
+ public weak string get_text_include_trailing_spaces (GLib.Callback is_selected, void* data, GLib.Array attributes);
+ public weak string get_text_range (long start_row, long start_col, long end_row, long end_col, GLib.Callback is_selected, void* data, GLib.Array attributes);
public bool get_using_xft ();
public bool get_visible_bell ();
public weak string get_window_title ();
Modified: trunk/vapi/webkit-1.0.vapi
==============================================================================
--- trunk/vapi/webkit-1.0.vapi (original)
+++ trunk/vapi/webkit-1.0.vapi Sat Apr 19 16:06:52 2008
@@ -2,16 +2,16 @@
[CCode (cprefix = "WebKit", lower_case_cprefix = "webkit_")]
namespace WebKit {
- [CCode (cprefix = "WEBKIT_NAVIGATION_RESPONSE_", cheader_filename = "webkit/webkit.h")]
+ [CCode (cprefix = "WEBKIT_NAVIGATION_RESPONSE_", has_type_id = "0", cheader_filename = "webkit/webkit.h")]
public enum NavigationResponse {
ACCEPT,
IGNORE,
- DOWNLOAD,
+ DOWNLOAD
}
- [CCode (cprefix = "WEBKIT_WEB_VIEW_TARGET_INFO_", cheader_filename = "webkit/webkit.h")]
+ [CCode (cprefix = "WEBKIT_WEB_VIEW_TARGET_INFO_", has_type_id = "0", cheader_filename = "webkit/webkit.h")]
public enum WebViewTargetInfo {
HTML,
- TEXT,
+ TEXT
}
[CCode (cheader_filename = "webkit/webkit.h")]
public class NetworkRequest : GLib.Object {
@@ -175,13 +175,13 @@
public signal void populate_popup (Gtk.Menu p0);
public signal bool script_alert (GLib.Object frame, string alert_message);
public signal bool script_confirm (GLib.Object frame, string confirm_message, bool did_confirm);
- public signal bool script_prompt (GLib.Object frame, string message, string default_value, pointer value);
+ public signal bool script_prompt (GLib.Object frame, string message, string default_value, void* value);
[HasEmitter]
public signal void select_all ();
public signal void selection_changed ();
public signal void set_scroll_adjustments (Gtk.Adjustment p0, Gtk.Adjustment p1);
public signal void status_bar_text_changed (string p0);
public signal void title_changed (WebKit.WebFrame p0, string p1);
- public signal void window_object_cleared (WebKit.WebFrame frame, pointer context, pointer window_object);
+ public signal void window_object_cleared (WebKit.WebFrame frame, void* context, void* window_object);
}
}
Modified: trunk/vapigen/valagidlparser.vala
==============================================================================
--- trunk/vapigen/valagidlparser.vala (original)
+++ trunk/vapigen/valagidlparser.vala Sat Apr 19 16:06:52 2008
@@ -99,7 +99,7 @@
current_source_file = source_file;
codenode_attributes_map = new HashMap<string,string> (str_hash, str_equal);
- codenode_attributes_patterns = new HashMap<pointer,string> (direct_hash, (EqualFunc) PatternSpec.equal);
+ codenode_attributes_patterns = new HashMap<void*,string> (direct_hash, (EqualFunc) PatternSpec.equal);
if (FileUtils.test (metadata_filename, FileTest.EXISTS)) {
try {
@@ -421,8 +421,7 @@
current_source_file.add_node (cl);
if (base_class != null) {
- var parent = new UnresolvedType ();
- parse_type_string (parent, base_class);
+ var parent = parse_type_string (base_class);
cl.add_base_type (parent);
}
}
@@ -817,12 +816,10 @@
}
if (base_class != null) {
- var parent = new UnresolvedType ();
- parse_type_string (parent, base_class);
+ var parent = parse_type_string (base_class);
cl.add_base_type (parent);
} else if (node.parent != null) {
- var parent = new UnresolvedType ();
- parse_type_string (parent, node.parent);
+ var parent = parse_type_string (node.parent);
cl.add_base_type (parent);
} else {
var gobject_symbol = new UnresolvedSymbol (new UnresolvedSymbol (null, "GLib"), "Object");
@@ -830,8 +827,7 @@
}
foreach (string iface_name in node.interfaces) {
- var iface = new UnresolvedType ();
- parse_type_string (iface, iface_name);
+ var iface = parse_type_string (iface_name);
cl.add_base_type (iface);
}
@@ -927,8 +923,7 @@
}
foreach (string prereq_name in node.prerequisites) {
- var prereq = new UnresolvedType ();
- parse_type_string (prereq, prereq_name);
+ var prereq = parse_type_string (prereq_name);
iface.add_prerequisite (prereq);
}
@@ -980,15 +975,15 @@
current_data_type = null;
}
- private UnresolvedType? parse_type (IdlNodeType type_node, out ParameterDirection direction = null) {
+ private DataType? parse_type (IdlNodeType type_node, out ParameterDirection direction = null) {
ParameterDirection dir = ParameterDirection.IN;
var type = new UnresolvedType ();
if (type_node.tag == TypeTag.VOID) {
if (type_node.is_pointer) {
- type.unresolved_symbol = new UnresolvedSymbol (null, "pointer");
+ return new PointerType (new VoidType ());
} else {
- type.unresolved_symbol = new UnresolvedSymbol (null, "void");
+ return new VoidType ();
}
} else if (type_node.tag == TypeTag.BOOLEAN) {
type.unresolved_symbol = new UnresolvedSymbol (null, "bool");
@@ -1029,7 +1024,11 @@
} else if (type_node.tag == TypeTag.FILENAME) {
type.unresolved_symbol = new UnresolvedSymbol (null, "string");
} else if (type_node.tag == TypeTag.ARRAY) {
- type = parse_type (type_node.parameter_type1);
+ var element_type = parse_type (type_node.parameter_type1);
+ type = element_type as UnresolvedType;
+ if (type == null) {
+ return element_type;
+ }
type.array_rank = 1;
} else if (type_node.tag == TypeTag.LIST) {
type.unresolved_symbol = new UnresolvedSymbol (new UnresolvedSymbol (null, "GLib"), "List");
@@ -1070,7 +1069,7 @@
} else if (n == "gshort") {
type.unresolved_symbol = new UnresolvedSymbol (null, "short");
} else if (n == "gconstpointer" || n == "void") {
- type.unresolved_symbol = new UnresolvedSymbol (null, "pointer");
+ return new PointerType (new VoidType ());
} else if (n == "goffset" || n == "off_t") {
type.unresolved_symbol = new UnresolvedSymbol (null, "int64");
} else if (n == "value_array") {
@@ -1088,9 +1087,9 @@
} else if (n == "FILE") {
type.unresolved_symbol = new UnresolvedSymbol (new UnresolvedSymbol (null, "GLib"), "FileStream");
} else if (n == "struct") {
- type.unresolved_symbol = new UnresolvedSymbol (null, "pointer");
+ return new PointerType (new VoidType ());
} else if (n == "iconv_t") {
- type.unresolved_symbol = new UnresolvedSymbol (null, "pointer");
+ return new PointerType (new VoidType ());
} else if (n == "GType") {
type.unresolved_symbol = new UnresolvedSymbol (new UnresolvedSymbol (null, "GLib"), "Type");
if (type_node.is_pointer) {
@@ -1100,7 +1099,11 @@
type.unresolved_symbol = new UnresolvedSymbol (null, "string");
type.array_rank = 1;
} else {
- parse_type_string (type, n);
+ var named_type = parse_type_string (n);
+ type = named_type as UnresolvedType;
+ if (type == null) {
+ return named_type;
+ }
if (is_simple_type (n)) {
if (type_node.is_pointer) {
dir = ParameterDirection.OUT;
@@ -1127,7 +1130,14 @@
return false;
}
- private void parse_type_string (UnresolvedType type, string n) {
+ private DataType parse_type_string (string n) {
+ if (n == "va_list") {
+ // unsupported
+ return new PointerType (new VoidType ());
+ }
+
+ var type = new UnresolvedType ();
+
var dt = cname_type_map[n];
if (dt != null) {
UnresolvedSymbol parent_symbol = null;
@@ -1135,7 +1145,7 @@
parent_symbol = new UnresolvedSymbol (null, dt.parent_symbol.name);
}
type.unresolved_symbol = new UnresolvedSymbol (parent_symbol, dt.name);
- return;
+ return type;
}
var type_attributes = get_attributes (n);
@@ -1159,16 +1169,16 @@
}
if (type.unresolved_symbol != null) {
+ if (type.unresolved_symbol.name == "pointer") {
+ return new PointerType (new VoidType ());
+ }
if (ns_name != null) {
type.unresolved_symbol.inner = new UnresolvedSymbol (null, ns_name);
}
- return;
+ return type;
}
- if (n == "va_list") {
- // unsupported
- type.unresolved_symbol = new UnresolvedSymbol (null, "pointer");
- } else if (n.has_prefix (current_namespace.name)) {
+ if (n.has_prefix (current_namespace.name)) {
type.unresolved_symbol = new UnresolvedSymbol (new UnresolvedSymbol (null, current_namespace.name), n.offset (current_namespace.name.len ()));
} else if (n.has_prefix ("G")) {
type.unresolved_symbol = new UnresolvedSymbol (new UnresolvedSymbol (null, "GLib"), n.offset (1));
@@ -1180,9 +1190,11 @@
type.unresolved_symbol = new UnresolvedSymbol (new UnresolvedSymbol (null, name_parts[0]), name_parts[1]);
}
}
+
+ return type;
}
- private UnresolvedType parse_param (IdlNodeParam param, out ParameterDirection direction = null) {
+ private DataType? parse_param (IdlNodeParam param, out ParameterDirection direction = null) {
var type = parse_type (param.type, out direction);
// disable for now as null_ok not yet correctly set
@@ -1192,7 +1204,7 @@
}
private Method? create_method (string name, string symbol, IdlNodeParam? res, GLib.List<IdlNodeParam>? parameters, bool is_constructor, bool is_interface) {
- UnresolvedType return_type = null;
+ DataType return_type = null;
if (res != null) {
return_type = parse_param (res);
}
@@ -1206,11 +1218,7 @@
m.name = m.name.offset ("new_".len ());
}
} else {
- if (return_type.unresolved_symbol.name == "void") {
- m = new Method (name, new VoidType (), current_source_reference);
- } else {
- m = new Method (name, return_type, current_source_reference);
- }
+ m = new Method (name, return_type, current_source_reference);
}
m.access = SymbolAccessibility.PUBLIC;
@@ -1256,7 +1264,7 @@
m.sentinel = eval (nv[1]);
} else if (nv[0] == "is_array") {
if (eval (nv[1]) == "1") {
- return_type.array_rank = 1;
+ ((UnresolvedType) return_type).array_rank = 1;
}
} else if (nv[0] == "throws") {
if (eval (nv[1]) == "0") {
@@ -1267,7 +1275,7 @@
m.no_array_length = true;
}
} else if (nv[0] == "type_name") {
- return_type.unresolved_symbol = new UnresolvedSymbol (null, eval (nv[1]));
+ ((UnresolvedType) return_type).unresolved_symbol = new UnresolvedSymbol (null, eval (nv[1]));
} else if (nv[0] == "type_arguments") {
var type_args = eval (nv[1]).split (",");
foreach (string type_arg in type_args) {
@@ -1283,7 +1291,7 @@
bool first = true;
FormalParameter last_param = null;
- UnresolvedType last_param_type = null;
+ DataType last_param_type = null;
foreach (weak IdlNodeParam param in parameters) {
weak IdlNode param_node = (IdlNode) param;
@@ -1330,7 +1338,7 @@
var nv = attr.split ("=", 2);
if (nv[0] == "is_array") {
if (eval (nv[1]) == "1") {
- param_type.array_rank = 1;
+ ((UnresolvedType) param_type).array_rank = 1;
p.direction = ParameterDirection.IN;
}
} else if (nv[0] == "is_out") {
@@ -1363,7 +1371,7 @@
set_array_length_pos = true;
array_length_pos = eval (nv[1]).to_double ();
} else if (nv[0] == "type_name") {
- param_type.unresolved_symbol = new UnresolvedSymbol (null, eval (nv[1]));
+ ((UnresolvedType) param_type).unresolved_symbol = new UnresolvedSymbol (null, eval (nv[1]));
} else if (nv[0] == "type_arguments") {
var type_args = eval (nv[1]).split (",");
foreach (string type_arg in type_args) {
@@ -1377,7 +1385,7 @@
if (last_param != null && p.name == "n_" + last_param.name) {
// last_param is array, p is array length
- last_param_type.array_rank = 1;
+ ((UnresolvedType) last_param_type).array_rank = 1;
last_param.direction = ParameterDirection.IN;
// hide array length param
@@ -1559,14 +1567,14 @@
}
} else if (nv[0] == "is_array") {
if (eval (nv[1]) == "1") {
- type.array_rank = 1;
+ ((UnresolvedType) type).array_rank = 1;
}
} else if (nv[0] == "weak") {
if (eval (nv[1]) == "0") {
type.takes_ownership = true;
}
} else if (nv[0] == "type_name") {
- type.unresolved_symbol = new UnresolvedSymbol (null, eval (nv[1]));
+ ((UnresolvedType) type).unresolved_symbol = new UnresolvedSymbol (null, eval (nv[1]));
}
}
}
@@ -1678,7 +1686,7 @@
var nv = attr.split ("=", 2);
if (nv[0] == "is_array") {
if (eval (nv[1]) == "1") {
- param_type.array_rank = 1;
+ ((UnresolvedType) param_type).array_rank = 1;
p.direction = ParameterDirection.IN;
}
} else if (nv[0] == "is_out") {
@@ -1694,13 +1702,13 @@
param_type.nullable = true;
}
} else if (nv[0] == "type_name") {
- param_type.unresolved_symbol = new UnresolvedSymbol (null, eval (nv[1]));
+ ((UnresolvedType) param_type).unresolved_symbol = new UnresolvedSymbol (null, eval (nv[1]));
} else if (nv[0] == "namespace_name") {
ns_name = eval (nv[1]);
}
}
if (ns_name != null) {
- param_type.unresolved_symbol.inner = new UnresolvedSymbol (null, ns_name);
+ ((UnresolvedType) param_type).unresolved_symbol.inner = new UnresolvedSymbol (null, ns_name);
}
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
