From: Jürg Billeter Date: Tue, 28 Oct 2008 18:48:19 +0000 (+0000) Subject: Fix GMenuTreeItem binding X-Git-Tag: VALA_0_5_1~33 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73ad94e40bd5cddbd41065c5eb417976eb66522e;p=thirdparty%2Fvala.git Fix GMenuTreeItem binding 2008-10-28 Jürg Billeter * vapi/packages/libgnome-menu/: Fix GMenuTreeItem binding * vapi/*.vapi: Regenerate bindings svn path=/trunk/; revision=1938 --- diff --git a/ChangeLog b/ChangeLog index 7fafcd6a4..d08736bfc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-10-28 Jürg Billeter + + * vapi/packages/libgnome-menu/: + + Fix GMenuTreeItem binding + + * vapi/*.vapi: + + Regenerate bindings + 2008-10-28 Jürg Billeter * vala/valainterfacewriter.vala: diff --git a/vapi/atk.vapi b/vapi/atk.vapi index 6233bf837..417393571 100644 --- a/vapi/atk.vapi +++ b/vapi/atk.vapi @@ -419,10 +419,10 @@ namespace Atk { } [CCode (type_id = "ATK_TYPE_RECTANGLE", cheader_filename = "atk/atk.h")] public struct Rectangle { - public int height; - public int width; public int x; public int y; + public int width; + public int height; } [CCode (cprefix = "ATK_XY_", cheader_filename = "atk/atk.h")] public enum CoordType { diff --git a/vapi/gdk-2.0.vapi b/vapi/gdk-2.0.vapi index ee39ff2e6..f62e9f6fe 100644 --- a/vapi/gdk-2.0.vapi +++ b/vapi/gdk-2.0.vapi @@ -557,10 +557,10 @@ namespace Gdk { } [CCode (type_id = "GDK_TYPE_COLOR", cheader_filename = "gdk/gdk.h")] public struct Color { - public ushort blue; - public ushort green; public uint pixel; public ushort red; + public ushort green; + public ushort blue; public Gdk.Color copy (); public bool equal (Gdk.Color colorb); public void free (); @@ -570,9 +570,9 @@ namespace Gdk { } [CCode (cheader_filename = "gdk/gdk.h")] public struct DeviceAxis { - public double max; - public double min; public Gdk.AxisUse use; + public double min; + public double max; } [CCode (cheader_filename = "gdk/gdk.h")] public struct DeviceKey { @@ -581,27 +581,27 @@ namespace Gdk { } [CCode (type_id = "GDK_TYPE_EVENT", cheader_filename = "gdk/gdk.h")] public struct Event { + public Gdk.EventType type; public Gdk.EventAny any; + public Gdk.EventExpose expose; + public Gdk.EventNoExpose no_expose; + public Gdk.EventVisibility visibility; + public Gdk.EventMotion motion; public Gdk.EventButton button; - public Gdk.EventClient client; - public Gdk.EventConfigure configure; + public Gdk.EventScroll scroll; + public Gdk.EventKey key; public Gdk.EventCrossing crossing; - public Gdk.EventDND dnd; - public Gdk.EventExpose expose; public Gdk.EventFocus focus_change; - public Gdk.EventGrabBroken grab_broken; - public Gdk.EventKey key; - public Gdk.EventMotion motion; - public Gdk.EventNoExpose no_expose; - public Gdk.EventOwnerChange owner_change; + public Gdk.EventConfigure configure; public Gdk.EventProperty property; - public Gdk.EventProximity proximity; - public Gdk.EventScroll scroll; public Gdk.EventSelection selection; - public Gdk.EventSetting setting; - public Gdk.EventType type; - public Gdk.EventVisibility visibility; + public Gdk.EventOwnerChange owner_change; + public Gdk.EventProximity proximity; + public Gdk.EventClient client; + public Gdk.EventDND dnd; public Gdk.EventWindowState window_state; + public Gdk.EventSetting setting; + public Gdk.EventGrabBroken grab_broken; public Gdk.Event copy (); public void free (); public static Gdk.Event get (); @@ -625,246 +625,246 @@ namespace Gdk { } [CCode (cheader_filename = "gdk/gdk.h")] public struct EventAny { - public char send_event; public Gdk.EventType type; public weak Gdk.Window window; + public char send_event; } [CCode (cheader_filename = "gdk/gdk.h")] public struct EventButton { - public double axes; - public uint button; - public weak Gdk.Device device; - public char send_event; - public uint state; - public uint time; public Gdk.EventType type; public weak Gdk.Window window; + public char send_event; + public uint time; public double x; - public double x_root; public double y; + public double axes; + public uint state; + public uint button; + public weak Gdk.Device device; + public double x_root; public double y_root; } [CCode (cheader_filename = "gdk/gdk.h")] public struct EventClient { - public void* data; - public ushort data_format; - public Gdk.Atom message_type; - public char send_event; public Gdk.EventType type; public weak Gdk.Window window; + public char send_event; + public Gdk.Atom message_type; + public ushort data_format; + public void* data; } [CCode (cheader_filename = "gdk/gdk.h")] public struct EventConfigure { - public int height; - public char send_event; public Gdk.EventType type; - public int width; public weak Gdk.Window window; + public char send_event; public int x; public int y; + public int width; + public int height; } [CCode (cheader_filename = "gdk/gdk.h")] public struct EventCrossing { - public Gdk.NotifyType detail; - public bool focus; - public Gdk.CrossingMode mode; + public Gdk.EventType type; + public weak Gdk.Window window; public char send_event; - public uint state; public weak Gdk.Window subwindow; public uint time; - public Gdk.EventType type; - public weak Gdk.Window window; public double x; - public double x_root; public double y; + public double x_root; public double y_root; + public Gdk.CrossingMode mode; + public Gdk.NotifyType detail; + public bool focus; + public uint state; } [CCode (cheader_filename = "gdk/gdk.h")] public struct EventDND { - public weak Gdk.DragContext context; - public char send_event; - public uint time; public Gdk.EventType type; public weak Gdk.Window window; + public char send_event; + public weak Gdk.DragContext context; + public uint time; public short x_root; public short y_root; } [CCode (cheader_filename = "gdk/gdk.h")] public struct EventExpose { - public Gdk.Rectangle area; - public int count; - public weak Gdk.Region region; - public char send_event; public Gdk.EventType type; public weak Gdk.Window window; + public char send_event; + public Gdk.Rectangle area; + public weak Gdk.Region region; + public int count; } [CCode (cheader_filename = "gdk/gdk.h")] public struct EventFocus { - public short @in; - public char send_event; public Gdk.EventType type; public weak Gdk.Window window; + public char send_event; + public short @in; } [CCode (cheader_filename = "gdk/gdk.h")] public struct EventGrabBroken { - public weak Gdk.Window grab_window; - public bool implicit; - public bool keyboard; - public char send_event; public Gdk.EventType type; public weak Gdk.Window window; + public char send_event; + public bool keyboard; + public bool implicit; + public weak Gdk.Window grab_window; } [CCode (cheader_filename = "gdk/gdk.h")] public struct EventKey { - public uchar group; - public ushort hardware_keycode; - public uint is_modifier; - public uint keyval; - public int length; + public Gdk.EventType type; + public weak Gdk.Window window; public char send_event; + public uint time; public uint state; + public uint keyval; + public int length; [CCode (cname = "string")] public weak string str; - public uint time; - public Gdk.EventType type; - public weak Gdk.Window window; + public ushort hardware_keycode; + public uchar group; + public uint is_modifier; } [CCode (cheader_filename = "gdk/gdk.h")] public struct EventMotion { - public double axes; - public weak Gdk.Device device; - public bool is_hint; - public char send_event; - public Gdk.ModifierType state; - public uint time; public Gdk.EventType type; public weak Gdk.Window window; + public char send_event; + public uint time; public double x; - public double x_root; public double y; + public double axes; + public Gdk.ModifierType state; + public bool is_hint; + public weak Gdk.Device device; + public double x_root; public double y_root; } [CCode (cheader_filename = "gdk/gdk.h")] public struct EventNoExpose { - public char send_event; public Gdk.EventType type; public weak Gdk.Window window; + public char send_event; } [CCode (cheader_filename = "gdk/gdk.h")] public struct EventOwnerChange { + public Gdk.EventType type; + public weak Gdk.Window window; + public char send_event; public Gdk.NativeWindow owner; public Gdk.OwnerChange reason; public Gdk.Atom selection; - public uint selection_time; - public char send_event; public uint time; - public Gdk.EventType type; - public weak Gdk.Window window; + public uint selection_time; } [CCode (cheader_filename = "gdk/gdk.h")] public struct EventProperty { - public Gdk.Atom atom; - public char send_event; - public uint state; - public uint time; public Gdk.EventType type; public weak Gdk.Window window; + public char send_event; + public Gdk.Atom atom; + public uint time; + public uint state; } [CCode (cheader_filename = "gdk/gdk.h")] public struct EventProximity { - public weak Gdk.Device device; - public char send_event; - public uint time; public Gdk.EventType type; public weak Gdk.Window window; + public char send_event; + public uint time; + public weak Gdk.Device device; } [CCode (cheader_filename = "gdk/gdk.h")] public struct EventScroll { - public weak Gdk.Device device; - public Gdk.ScrollDirection direction; - public char send_event; - public uint state; - public uint time; public Gdk.EventType type; public weak Gdk.Window window; + public char send_event; + public uint time; public double x; - public double x_root; public double y; + public uint state; + public Gdk.ScrollDirection direction; + public weak Gdk.Device device; + public double x_root; public double y_root; } [CCode (cheader_filename = "gdk/gdk.h")] public struct EventSelection { - public Gdk.Atom property; - public Gdk.NativeWindow requestor; - public Gdk.Atom selection; + public Gdk.EventType type; + public weak Gdk.Window window; public char send_event; + public Gdk.Atom selection; public Gdk.Atom target; + public Gdk.Atom property; public uint time; - public Gdk.EventType type; - public weak Gdk.Window window; + public Gdk.NativeWindow requestor; } [CCode (cheader_filename = "gdk/gdk.h")] public struct EventSetting { - public Gdk.SettingAction action; - public weak string name; - public char send_event; public Gdk.EventType type; public weak Gdk.Window window; + public char send_event; + public Gdk.SettingAction action; + public weak string name; } [CCode (cheader_filename = "gdk/gdk.h")] public struct EventVisibility { - public char send_event; - public Gdk.VisibilityState state; public Gdk.EventType type; public weak Gdk.Window window; + public char send_event; + public Gdk.VisibilityState state; } [CCode (cheader_filename = "gdk/gdk.h")] public struct EventWindowState { - public Gdk.WindowState changed_mask; - public Gdk.WindowState new_window_state; - public char send_event; public Gdk.EventType type; public weak Gdk.Window window; + public char send_event; + public Gdk.WindowState changed_mask; + public Gdk.WindowState new_window_state; } [CCode (cheader_filename = "gdk/gdk.h")] public struct GCValues { + public Gdk.Color foreground; public Gdk.Color background; - public Gdk.CapStyle cap_style; - public weak Gdk.Pixmap clip_mask; - public int clip_x_origin; - public int clip_y_origin; - public Gdk.Fill fill; public weak Gdk.Font font; - public Gdk.Color foreground; public Gdk.Function function; - public int graphics_exposures; - public Gdk.JoinStyle join_style; - public Gdk.LineStyle line_style; - public int line_width; + public Gdk.Fill fill; + public weak Gdk.Pixmap tile; public weak Gdk.Pixmap stipple; + public weak Gdk.Pixmap clip_mask; public Gdk.SubwindowMode subwindow_mode; - public weak Gdk.Pixmap tile; public int ts_x_origin; public int ts_y_origin; + public int clip_x_origin; + public int clip_y_origin; + public int graphics_exposures; + public int line_width; + public Gdk.LineStyle line_style; + public Gdk.CapStyle cap_style; + public Gdk.JoinStyle join_style; } [CCode (cheader_filename = "gdk/gdk.h")] public struct Geometry { - public int base_height; + public int min_width; + public int min_height; + public int max_width; + public int max_height; public int base_width; + public int base_height; + public int width_inc; public int height_inc; - public double max_aspect; - public int max_height; - public int max_width; public double min_aspect; - public int min_height; - public int min_width; - public int width_inc; + public double max_aspect; public Gdk.Gravity win_gravity; } [CCode (cheader_filename = "gdk/gdk.h")] public struct KeymapKey { - public int group; public uint keycode; + public int group; public int level; } [CCode (cheader_filename = "gdk/gdk.h")] @@ -898,10 +898,10 @@ namespace Gdk { } [CCode (type_id = "GDK_TYPE_RECTANGLE", cheader_filename = "gdk/gdk.h")] public struct Rectangle { - public int height; - public int width; public int x; public int y; + public int width; + public int height; public bool intersect (Gdk.Rectangle src2, Gdk.Rectangle dest); public void union (Gdk.Rectangle src2, out Gdk.Rectangle dest); } @@ -909,8 +909,8 @@ namespace Gdk { public struct RgbCmap { [NoArrayLength] public weak uint[] colors; - public weak GLib.SList info_list; public int n_colors; + public weak GLib.SList info_list; public void free (); [CCode (cname = "gdk_rgb_cmap_new", has_construct_function = false)] public RgbCmap (uint[] colors); @@ -918,51 +918,51 @@ namespace Gdk { [CCode (cheader_filename = "gdk/gdk.h")] public struct Segment { public int x1; - public int x2; public int y1; + public int x2; public int y2; } [CCode (cheader_filename = "gdk/gdk.h")] public struct Span { - public int width; public int x; public int y; + public int width; } [CCode (cheader_filename = "gdk/gdk.h")] public struct TimeCoord { + public uint time; [NoArrayLength] public weak double[] axes; - public uint time; } [CCode (cheader_filename = "gdk/gdk.h")] public struct Trapezoid { + public double y1; public double x11; - public double x12; public double x21; - public double x22; - public double y1; public double y2; + public double x12; + public double x22; } [CCode (cheader_filename = "gdk/gdk.h")] public struct WChar { } [CCode (cheader_filename = "gdk/gdk.h")] public struct WindowAttr { - public weak Gdk.Colormap colormap; - public weak Gdk.Cursor cursor; + public weak string title; public int event_mask; + public int x; + public int y; + public int width; public int height; - public bool override_redirect; - public weak string title; - public Gdk.WindowTypeHint type_hint; - public weak Gdk.Visual visual; public Gdk.WindowClass wclass; - public int width; + public weak Gdk.Visual visual; + public weak Gdk.Colormap colormap; public Gdk.WindowType window_type; - public weak string wmclass_class; + public weak Gdk.Cursor cursor; public weak string wmclass_name; - public int x; - public int y; + public weak string wmclass_class; + public bool override_redirect; + public Gdk.WindowTypeHint type_hint; } [CCode (cheader_filename = "gdk/gdk.h")] public struct WindowRedirect { diff --git a/vapi/gdk-pixbuf-2.0.vapi b/vapi/gdk-pixbuf-2.0.vapi index 7c16f2b9e..f494d2f19 100644 --- a/vapi/gdk-pixbuf-2.0.vapi +++ b/vapi/gdk-pixbuf-2.0.vapi @@ -141,14 +141,14 @@ namespace Gdk { } [CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")] public struct Pixdata { - public uint height; - public int length; public uint magic; + public int length; public uint pixdata_type; - [NoArrayLength] - public weak uchar[] pixel_data; public uint rowstride; public uint width; + public uint height; + [NoArrayLength] + public weak uchar[] pixel_data; public bool deserialize ([CCode (array_length_pos = 0.9)] uchar[] stream) throws GLib.Error; public void* from_pixbuf (Gdk.Pixbuf pixbuf, bool use_rle); public weak uchar[] serialize (); diff --git a/vapi/goocanvas.vapi b/vapi/goocanvas.vapi index 69f1569d4..bd96414c9 100644 --- a/vapi/goocanvas.vapi +++ b/vapi/goocanvas.vapi @@ -694,8 +694,8 @@ namespace Goo { [CCode (type_id = "GOO_TYPE_CANVAS_BOUNDS", cheader_filename = "goocanvas.h")] public struct CanvasBounds { public double x1; - public double x2; public double y1; + public double x2; public double y2; } [CCode (cheader_filename = "goocanvas.h")] @@ -707,32 +707,32 @@ namespace Goo { } [CCode (cheader_filename = "goocanvas.h")] public struct CanvasImageData { - public double height; public weak Cairo.Pattern pattern; - public double width; public double x; public double y; + public double width; + public double height; } [CCode (cheader_filename = "goocanvas.h")] public struct CanvasItemSimpleData { - public uint cache_setting; - public uint can_focus; - public uint clip_fill_rule; - public weak GLib.Array clip_path_commands; - public uint has_tooltip; - public uint own_style; - public uint pointer_events; public weak Goo.CanvasStyle style; - public weak string tooltip; public Cairo.Matrix transform; - public uint visibility; + public weak GLib.Array clip_path_commands; + public weak string tooltip; public double visibility_threshold; + public uint visibility; + public uint pointer_events; + public uint can_focus; + public uint own_style; + public uint clip_fill_rule; + public uint cache_setting; + public uint has_tooltip; } [CCode (cheader_filename = "goocanvas.h")] public struct CanvasPathCommand { - public void* arc; - public void* curve; public void* simple; + public void* curve; + public void* arc; } [CCode (cheader_filename = "goocanvas.h")] public struct CanvasPathData { @@ -740,36 +740,36 @@ namespace Goo { } [CCode (cheader_filename = "goocanvas.h")] public struct CanvasPolylineArrowData { + public double arrow_width; public double arrow_length; public double arrow_tip_length; - public double arrow_width; [NoArrayLength] - public weak double[] end_arrow_coords; + public weak double[] line_start; [NoArrayLength] public weak double[] line_end; [NoArrayLength] - public weak double[] line_start; - [NoArrayLength] public weak double[] start_arrow_coords; + [NoArrayLength] + public weak double[] end_arrow_coords; } [CCode (cheader_filename = "goocanvas.h")] public struct CanvasPolylineData { + public double coords; public Goo.CanvasPolylineArrowData arrow_data; + public uint num_points; public uint close_path; - public double coords; + public uint start_arrow; public uint end_arrow; - public uint num_points; public uint reconfigure_arrows; - public uint start_arrow; } [CCode (cheader_filename = "goocanvas.h")] public struct CanvasRectData { + public double x; + public double y; + public double width; public double height; public double radius_x; public double radius_y; - public double width; - public double x; - public double y; } [CCode (cheader_filename = "goocanvas.h")] public struct CanvasStyleProperty { @@ -778,35 +778,35 @@ namespace Goo { } [CCode (cheader_filename = "goocanvas.h")] public struct CanvasTableData { - public double border_width; - public weak GLib.Array children; + public double width; + public double height; [NoArrayLength] public weak Goo.CanvasTableDimension[] dimensions; - public double height; + public double border_width; + public weak GLib.Array children; public Goo.CanvasTableLayoutData layout_data; - public double width; } [CCode (cheader_filename = "goocanvas.h")] public struct CanvasTableDimension { - public double default_spacing; - public uint homogeneous; public int size; + public double default_spacing; public double spacings; + public uint homogeneous; } [CCode (cheader_filename = "goocanvas.h")] public struct CanvasTableLayoutData { } [CCode (cheader_filename = "goocanvas.h")] public struct CanvasTextData { - public uint alignment; - public uint anchor; - public uint ellipsize; public weak string text; - public uint use_markup; - public double width; - public uint wrap; public double x; public double y; + public double width; + public uint use_markup; + public uint anchor; + public uint alignment; + public uint ellipsize; + public uint wrap; } [CCode (cprefix = "CAIRO_ANTIALIAS_", has_type_id = "0", cheader_filename = "goocanvas.h")] public enum CairoAntialias { diff --git a/vapi/gstreamer-0.10.vapi b/vapi/gstreamer-0.10.vapi index 948f0cff7..6e188e0d7 100644 --- a/vapi/gstreamer-0.10.vapi +++ b/vapi/gstreamer-0.10.vapi @@ -1343,17 +1343,17 @@ namespace Gst { } [CCode (cheader_filename = "gst/gst.h")] public struct ElementDetails { - public weak string author; - public weak string description; - public weak string klass; public weak string longname; + public weak string klass; + public weak string description; + public weak string author; } [CCode (cheader_filename = "gst/gst.h")] public struct FormatDefinition { - public weak string description; + public Gst.Format value; public weak string nick; + public weak string description; public GLib.Quark quark; - public Gst.Format value; } [CCode (cheader_filename = "gst/gst.h")] public struct StaticCaps { @@ -1363,8 +1363,8 @@ namespace Gst { } [CCode (cheader_filename = "gst/gst.h")] public struct StaticPadTemplate { - public Gst.PadDirection direction; public weak string name_template; + public Gst.PadDirection direction; public Gst.PadPresence presence; public Gst.StaticCaps static_caps; public Gst.PadTemplate get (); diff --git a/vapi/gstreamer-interfaces-0.10.vapi b/vapi/gstreamer-interfaces-0.10.vapi index 88f32f7d6..0b0d5b6f5 100644 --- a/vapi/gstreamer-interfaces-0.10.vapi +++ b/vapi/gstreamer-interfaces-0.10.vapi @@ -90,12 +90,12 @@ namespace Gst { public interface PropertyProbe { public abstract weak GLib.List get_properties (); public weak GLib.ParamSpec get_property (string name); - public abstract GLib.ValueArray get_values (GLib.ParamSpec pspec); - public GLib.ValueArray get_values_name (string name); + public abstract weak GLib.ValueArray get_values (GLib.ParamSpec pspec); + public weak GLib.ValueArray get_values_name (string name); public abstract bool needs_probe (GLib.ParamSpec pspec); public bool needs_probe_name (string name); - public GLib.ValueArray probe_and_get_values (GLib.ParamSpec pspec); - public GLib.ValueArray probe_and_get_values_name (string name); + public weak GLib.ValueArray probe_and_get_values (GLib.ParamSpec pspec); + public weak GLib.ValueArray probe_and_get_values_name (string name); public abstract void probe_property (GLib.ParamSpec pspec); public void probe_property_name (string name); public virtual signal void probe_needed (void* pspec); diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi index 678f7c21a..9d8c39c1a 100644 --- a/vapi/gtk+-2.0.vapi +++ b/vapi/gtk+-2.0.vapi @@ -5499,27 +5499,27 @@ namespace Gtk { } [CCode (cheader_filename = "gtk/gtk.h")] public struct ActionEntry { - public weak string accelerator; - [CCode (type = "GCallback")] - public weak Gtk.ActionCallback callback; - public weak string label; public weak string name; public weak string stock_id; + public weak string label; + public weak string accelerator; public weak string tooltip; + [CCode (type = "GCallback")] + public weak Gtk.ActionCallback callback; } [CCode (cheader_filename = "gtk/gtk.h")] public struct Allocation { - public int height; - public int width; public int x; public int y; + public int width; + public int height; } [CCode (type_id = "GTK_TYPE_BORDER", cheader_filename = "gtk/gtk.h")] public struct Border { - public int bottom; public int left; public int right; public int top; + public int bottom; public Gtk.Border copy (); public void free (); [CCode (cname = "gtk_border_new", has_construct_function = false)] @@ -5527,45 +5527,40 @@ namespace Gtk { } [CCode (cheader_filename = "gtk/gtk.h")] public struct RadioActionEntry { - public weak string accelerator; - public weak string label; public weak string name; public weak string stock_id; + public weak string label; + public weak string accelerator; public weak string tooltip; public int value; } [CCode (cheader_filename = "gtk/gtk.h")] public struct RecentData { - public string app_exec; - public string app_name; - public string description; public string display_name; + public string description; + public string mime_type; + public string app_name; + public string app_exec; [NoArrayLength] public string[] groups; public bool is_private; - public string mime_type; } [CCode (type_id = "GTK_TYPE_REQUISITION", cheader_filename = "gtk/gtk.h")] public struct Requisition { - public int height; public int width; + public int height; public Gtk.Requisition copy (); public void free (); } [CCode (cheader_filename = "gtk/gtk.h")] public struct TargetEntry { + public weak string target; public uint flags; public uint info; - public weak string target; } [CCode (type_id = "GTK_TYPE_TEXT_ITER", cheader_filename = "gtk/gtk.h")] public struct TextIter { public void* dummy1; - public void* dummy10; - public int dummy11; - public int dummy12; - public int dummy13; - public void* dummy14; public void* dummy2; public int dummy3; public int dummy4; @@ -5574,6 +5569,11 @@ namespace Gtk { public int dummy7; public int dummy8; public void* dummy9; + public void* dummy10; + public int dummy11; + public int dummy12; + public int dummy13; + public void* dummy14; public bool backward_char (); public bool backward_chars (int count); public bool backward_cursor_position (); @@ -5667,14 +5667,14 @@ namespace Gtk { } [CCode (cheader_filename = "gtk/gtk.h")] public struct ToggleActionEntry { + public weak string name; + public weak string stock_id; + public weak string label; public weak string accelerator; + public weak string tooltip; [CCode (type = "GCallback")] public weak Gtk.ActionCallback callback; public bool is_active; - public weak string label; - public weak string name; - public weak string stock_id; - public weak string tooltip; } [CCode (type_id = "GTK_TYPE_TREE_ITER", cheader_filename = "gtk/gtk.h")] public struct TreeIter { diff --git a/vapi/libgnome-menu.vapi b/vapi/libgnome-menu.vapi index 26a7c2b79..07975f2d7 100644 --- a/vapi/libgnome-menu.vapi +++ b/vapi/libgnome-menu.vapi @@ -14,11 +14,13 @@ namespace GMenu { public void remove_monitor (GMenu.TreeChangedFunc callback); public void set_user_data (void* user_data, GLib.DestroyNotify dnotify); } + [Compact] [CCode (cheader_filename = "gnome-menus/gmenu-tree.h")] public class TreeAlias : GMenu.TreeItem { public weak GMenu.TreeDirectory get_directory (); public weak GMenu.TreeItem get_item (); } + [Compact] [CCode (cheader_filename = "gnome-menus/gmenu-tree.h")] public class TreeDirectory : GMenu.TreeItem { public weak string get_comment (); @@ -31,6 +33,7 @@ namespace GMenu { public weak GMenu.Tree get_tree (); public weak string make_path (GMenu.TreeEntry entry); } + [Compact] [CCode (cheader_filename = "gnome-menus/gmenu-tree.h")] public class TreeEntry : GMenu.TreeItem { public weak string get_comment (); @@ -43,6 +46,7 @@ namespace GMenu { public bool get_launch_in_terminal (); public weak string get_name (); } + [Compact] [CCode (cheader_filename = "gnome-menus/gmenu-tree.h")] public class TreeHeader : GMenu.TreeItem { public weak GMenu.TreeDirectory get_directory (); @@ -56,6 +60,7 @@ namespace GMenu { public TreeItem (); public void set_user_data (void* user_data, GLib.DestroyNotify dnotify); } + [Compact] [CCode (cheader_filename = "gnome-menus/gmenu-tree.h")] public class TreeSeparator : GMenu.TreeItem { } diff --git a/vapi/libgsf-1.vapi b/vapi/libgsf-1.vapi index 9bc9f67f8..135ea9367 100644 --- a/vapi/libgsf-1.vapi +++ b/vapi/libgsf-1.vapi @@ -698,7 +698,7 @@ namespace Gsf { [CCode (cheader_filename = "gsf/gsf-utils.h")] public static void shutdown_dynamic (GLib.TypeModule module); [CCode (cheader_filename = "gsf/gsf-docprop-vector.h")] - public static GLib.ValueArray value_get_docprop_varray (GLib.Value value); + public static weak GLib.ValueArray value_get_docprop_varray (GLib.Value value); [CCode (cheader_filename = "gsf/gsf-docprop-vector.h")] public static weak Gsf.DocPropVector value_get_docprop_vector (GLib.Value value); [CCode (cheader_filename = "gsf/gsf-timestamp.h")] diff --git a/vapi/libsoup-2.2.vapi b/vapi/libsoup-2.2.vapi index 16fa3c1ff..cf0401dc0 100644 --- a/vapi/libsoup-2.2.vapi +++ b/vapi/libsoup-2.2.vapi @@ -385,9 +385,9 @@ namespace Soup { } [CCode (cheader_filename = "libsoup/soup.h")] public struct DataBuffer { + public Soup.Ownership owner; public string body; public uint length; - public Soup.Ownership owner; } [CCode (cprefix = "SOUP_ADDRESS_FAMILY_", has_type_id = "0", cheader_filename = "libsoup/soup.h")] public enum AddressFamily { diff --git a/vapi/libsoup-2.4.vapi b/vapi/libsoup-2.4.vapi index 81c7c0b16..42f0e5fab 100644 --- a/vapi/libsoup-2.4.vapi +++ b/vapi/libsoup-2.4.vapi @@ -781,15 +781,15 @@ namespace Soup { [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 (void* args); + public static weak 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")] public static void value_array_insert (GLib.ValueArray array, uint index_, GLib.Type type); [CCode (cheader_filename = "libsoup/soup.h")] - public static GLib.ValueArray value_array_new (); + public static weak GLib.ValueArray value_array_new (); [CCode (cheader_filename = "libsoup/soup.h")] - public static GLib.ValueArray value_array_new_with_vals (...); + public static weak GLib.ValueArray value_array_new_with_vals (...); [CCode (cheader_filename = "libsoup/soup.h")] public static bool value_array_to_args (GLib.ValueArray array, void* args); [CCode (cheader_filename = "libsoup/soup.h")] @@ -821,7 +821,7 @@ namespace Soup { [CCode (cheader_filename = "libsoup/soup.h")] public static GLib.Quark xmlrpc_fault_quark (); [CCode (cheader_filename = "libsoup/soup.h")] - public static bool xmlrpc_parse_method_call (string method_call, int length, out weak string method_name, out GLib.ValueArray params); + public static bool xmlrpc_parse_method_call (string method_call, int length, out weak string method_name, out weak GLib.ValueArray params); [CCode (cheader_filename = "libsoup/soup.h")] public static bool xmlrpc_parse_method_response (string method_response, int length, GLib.Value value) throws GLib.Error; [CCode (cheader_filename = "libsoup/soup.h")] diff --git a/vapi/packages/libgnome-menu/libgnome-menu-custom.vala b/vapi/packages/libgnome-menu/libgnome-menu-custom.vala index 1cb1811cb..08a905f31 100644 --- a/vapi/packages/libgnome-menu/libgnome-menu-custom.vala +++ b/vapi/packages/libgnome-menu/libgnome-menu-custom.vala @@ -21,6 +21,7 @@ */ namespace GMenu { + [Compact] public class TreeItem { public extern TreeItemType get_type (); } diff --git a/vapi/pango.vapi b/vapi/pango.vapi index 339bcc261..52469894e 100644 --- a/vapi/pango.vapi +++ b/vapi/pango.vapi @@ -484,9 +484,9 @@ namespace Pango { } [CCode (type_id = "PANGO_TYPE_COLOR", cheader_filename = "pango/pango.h")] public struct Color { - public ushort blue; - public ushort green; public ushort red; + public ushort green; + public ushort blue; public Pango.Color copy (); public void free (); public bool parse (string spec); @@ -494,28 +494,28 @@ namespace Pango { } [CCode (cheader_filename = "pango/pango.h")] public struct LogAttr { - public uint backspace_deletes_character; - public uint is_char_break; - public uint is_cursor_position; - public uint is_expandable_space; public uint is_line_break; public uint is_mandatory_break; + public uint is_char_break; + public uint is_white; + public uint is_cursor_position; + public uint is_word_start; + public uint is_word_end; public uint is_sentence_boundary; - public uint is_sentence_end; public uint is_sentence_start; - public uint is_white; + public uint is_sentence_end; + public uint backspace_deletes_character; + public uint is_expandable_space; public uint is_word_boundary; - public uint is_word_end; - public uint is_word_start; } [CCode (type_id = "PANGO_TYPE_MATRIX", cheader_filename = "pango/pango.h")] public struct Matrix { - public double x0; public double xx; public double xy; - public double y0; public double yx; public double yy; + public double x0; + public double y0; public void concat (Pango.Matrix new_matrix); public Pango.Matrix copy (); public void free (); @@ -530,10 +530,10 @@ namespace Pango { } [CCode (cheader_filename = "pango/pango.h")] public struct Rectangle { - public int height; - public int width; public int x; public int y; + public int width; + public int height; } [CCode (cprefix = "PANGO_ALIGN_", cheader_filename = "pango/pango.h")] public enum Alignment {