Re: GIR-based vala bindings
- From: Lorenzo Masini <lorenxo86 gmail com>
- To: Jiří Techet <techet gmail com>
- Cc: libchamplain-list gnome org
- Subject: Re: GIR-based vala bindings
- Date: Fri, 08 Apr 2011 23:49:37 +0200
Il giorno gio, 07/04/2011 alle 23.42 +0200, Jiří Techet ha scritto:
> What does it mean that the vapi's weren't good? How did they look like
> (e.g. when diffed against those distributed with libchamplain)? Was
> something missing inside? Did you get any errors or warnings during
> their generation?
Diffs attached.
> I don't plan to make a release just with this single change - I don't
> find it that critical (vapi generation works fine in my opinion and in
> the worst case the package can be created by manually copying the vapi
> files from the tarball) so I'll wait for some time for other bugs to
> appear and make the release later. It would be better to find out
> what's causing that the vapi files aren't generated correctly on your
> system.
Uhm, another change could be to fix the macro to get the type of the
GtkChamplainEmbed to follow the nomenclature NAMESPACE_TYPE_CLASS. Now
it's GTK_TYPE_CHAMPLAIN_EMBED. The macro for GtkClutterEmbed type is
GTK_CLUTTER_EMBED, so the one for champlain-gtk should be
GTK_CHAMPLAIN_TYPE_EMBED.
However, if on your system all works fine, I hope that this issue is
related only with Arch, I'll try to find the cause.
Cheers
Lorenzo
--- champlain-vala-0.12/champlain-0.10.vapi 2011-04-08 09:49:06.894350756 +0200
+++ champlain-vala-git/champlain-0.10.vapi 2011-04-08 23:24:29.287222279 +0200
@@ -2,9 +2,8 @@
[CCode (cprefix = "Champlain", lower_case_cprefix = "champlain_", gir_namespace = "Champlain", gir_version = "0.10")]
namespace Champlain {
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_adjustment_get_type ()", cheader_filename = "champlain/champlain.h")]
public class Adjustment : GLib.Object {
- public Champlain.AdjustmentPrivate priv;
[CCode (has_construct_function = false)]
public Adjustment (double value, double lower, double upper, double step_increment, double page_increment, double page_size);
public bool clamp (bool interpolate, uint n_frames, uint fps);
@@ -37,6 +36,8 @@
public double left;
public double right;
public double top;
+ [CCode (has_construct_function = false)]
+ public BoundingBox ();
public void compose (Champlain.BoundingBox other);
public Champlain.BoundingBox copy ();
public void extend (double latitude, double longitude);
@@ -44,32 +45,30 @@
public void get_center (out double latitude, out double longitude);
public bool is_valid ();
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_coordinate_get_type ()", cheader_filename = "champlain/champlain.h")]
public class Coordinate : GLib.InitiallyUnowned, Champlain.Location {
- public Champlain.CoordinatePrivate priv;
[CCode (has_construct_function = false)]
public Coordinate ();
[CCode (has_construct_function = false)]
public Coordinate.full (double latitude, double longitude);
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_custom_marker_get_type ()", cheader_filename = "champlain/champlain.h")]
public class CustomMarker : Champlain.Marker, Atk.Implementor, Champlain.Location, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
- public Champlain.CustomMarkerPrivate priv;
[CCode (type = "ClutterActor*", has_construct_function = false)]
public CustomMarker ();
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_error_tile_renderer_get_type ()", cheader_filename = "champlain/champlain.h")]
public class ErrorTileRenderer : Champlain.Renderer {
- public Champlain.ErrorTileRendererPrivate priv;
[CCode (has_construct_function = false)]
public ErrorTileRenderer (uint tile_size);
public uint get_tile_size ();
public void set_tile_size (uint size);
public uint tile_size { get; set; }
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_file_cache_get_type ()", cheader_filename = "champlain/champlain.h")]
public class FileCache : Champlain.TileCache {
- public Champlain.FileCachePrivate priv;
+ [CCode (has_construct_function = false)]
+ protected FileCache ();
[CCode (has_construct_function = false)]
public FileCache.full (uint size_limit, string? cache_dir, Champlain.Renderer renderer);
public unowned string get_cache_dir ();
@@ -80,21 +79,21 @@
public string cache_dir { get; construct; }
public uint size_limit { get; set construct; }
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_file_tile_source_get_type ()", cheader_filename = "champlain/champlain.h")]
public class FileTileSource : Champlain.TileSource {
[CCode (has_construct_function = false)]
+ protected FileTileSource ();
+ [CCode (has_construct_function = false)]
public FileTileSource.full (string id, string name, string license, string license_uri, uint min_zoom, uint max_zoom, uint tile_size, Champlain.MapProjection projection, Champlain.Renderer renderer);
public void load_map_data (string map_path);
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_image_renderer_get_type ()", cheader_filename = "champlain/champlain.h")]
public class ImageRenderer : Champlain.Renderer {
- public Champlain.ImageRendererPrivate priv;
[CCode (has_construct_function = false)]
public ImageRenderer ();
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_kinetic_scroll_view_get_type ()", cheader_filename = "champlain/champlain.h")]
public class KineticScrollView : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
- public Champlain.KineticScrollViewPrivate priv;
[CCode (type = "ClutterActor*", has_construct_function = false)]
public KineticScrollView (bool kinetic);
public void stop ();
@@ -106,9 +105,8 @@
public uint motion_buffer { get; set; }
public signal void panning_completed ();
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_label_get_type ()", cheader_filename = "champlain/champlain.h")]
public class Label : Champlain.Marker, Atk.Implementor, Champlain.Location, Clutter.Animatable, Clutter.Scriptable {
- public Champlain.LabelPrivate priv;
[CCode (type = "ClutterActor*", has_construct_function = false)]
public Label ();
[CCode (type = "ClutterActor*", has_construct_function = false)]
@@ -158,14 +156,15 @@
public bool wrap { get; set; }
public Pango.WrapMode wrap_mode { get; set; }
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_layer_get_type ()", cheader_filename = "champlain/champlain.h")]
public class Layer : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
+ [CCode (has_construct_function = false)]
+ protected Layer ();
public virtual Champlain.BoundingBox get_bounding_box ();
public virtual void set_view (Champlain.View view);
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_license_get_type ()", cheader_filename = "champlain/champlain.h")]
public class License : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
- public Champlain.LicensePrivate priv;
[CCode (type = "ClutterActor*", has_construct_function = false)]
public License ();
public void connect_view (Champlain.View view);
@@ -177,9 +176,10 @@
public Pango.Alignment alignment { get; set; }
public string extra_text { get; set; }
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_map_source_get_type ()", cheader_filename = "champlain/champlain.h")]
public class MapSource : GLib.InitiallyUnowned {
- public Champlain.MapSourcePrivate priv;
+ [CCode (has_construct_function = false)]
+ protected MapSource ();
public virtual void fill_tile (Champlain.Tile tile);
public uint get_column_count (uint zoom_level);
public virtual unowned string get_id ();
@@ -203,17 +203,17 @@
public Champlain.MapSource next_source { get; set; }
public Champlain.Renderer renderer { get; set; }
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_map_source_chain_get_type ()", cheader_filename = "champlain/champlain.h")]
public class MapSourceChain : Champlain.MapSource {
- public Champlain.MapSourceChainPrivate priv;
[CCode (has_construct_function = false)]
public MapSourceChain ();
public void pop ();
public void push (Champlain.MapSource map_source);
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_map_source_desc_get_type ()", cheader_filename = "champlain/champlain.h")]
public class MapSourceDesc : GLib.Object {
- public Champlain.MapSourceDescPrivate priv;
+ [CCode (has_construct_function = false)]
+ protected MapSourceDesc ();
public void* get_data ();
public unowned string get_id ();
public unowned string get_license ();
@@ -236,9 +236,10 @@
public uint tile_size { get; construct; }
public string uri_format { get; construct; }
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_map_source_factory_get_type ()", cheader_filename = "champlain/champlain.h")]
public class MapSourceFactory : GLib.Object {
- public Champlain.MapSourceFactoryPrivate priv;
+ [CCode (has_construct_function = false)]
+ protected MapSourceFactory ();
public Champlain.MapSource create (string id);
public Champlain.MapSource create_cached_source (string id);
public Champlain.MapSource create_error_source (uint tile_size);
@@ -246,9 +247,10 @@
public GLib.SList<weak Champlain.MapSourceDesc> get_registered ();
public bool register (Champlain.MapSourceDesc desc);
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_marker_get_type ()", cheader_filename = "champlain/champlain.h")]
public class Marker : Clutter.Actor, Atk.Implementor, Champlain.Location, Clutter.Animatable, Clutter.Scriptable {
- public Champlain.MarkerPrivate priv;
+ [CCode (has_construct_function = false)]
+ protected Marker ();
public void animate_in ();
public void animate_in_with_delay (uint delay);
public void animate_out ();
@@ -271,9 +273,8 @@
public signal void drag_finish (Clutter.Event since);
public signal void drag_motion (double dy, double event, Clutter.Event since);
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_marker_layer_get_type ()", cheader_filename = "champlain/champlain.h")]
public class MarkerLayer : Champlain.Layer, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
- public Champlain.MarkerLayerPrivate priv;
[CCode (has_construct_function = false)]
public MarkerLayer ();
public void add_marker (Champlain.Marker marker);
@@ -294,9 +295,10 @@
public void show_all_markers ();
public void unselect_all_markers ();
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_memory_cache_get_type ()", cheader_filename = "champlain/champlain.h")]
public class MemoryCache : Champlain.TileCache {
- public Champlain.MemoryCachePrivate priv;
+ [CCode (has_construct_function = false)]
+ protected MemoryCache ();
public void clean ();
[CCode (has_construct_function = false)]
public MemoryCache.full (uint size_limit, Champlain.Renderer renderer);
@@ -304,9 +306,10 @@
public void set_size_limit (uint size_limit);
public uint size_limit { get; set construct; }
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_memphis_renderer_get_type ()", cheader_filename = "champlain/champlain.h")]
public class MemphisRenderer : Champlain.Renderer {
- public Champlain.MemphisRendererPrivate priv;
+ [CCode (has_construct_function = false)]
+ protected MemphisRenderer ();
[CCode (has_construct_function = false)]
public MemphisRenderer.full (uint tile_size);
public Clutter.Color get_background_color ();
@@ -318,12 +321,13 @@
public void set_background_color (Clutter.Color color);
public void set_rule (Champlain.MemphisRule rule);
public void set_tile_size (uint size);
- public Champlain.BoundingBox bounding_box { get; set; }
+ public Champlain.BoundingBox bounding_box { owned get; set; }
public uint tile_size { get; set; }
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_network_bbox_tile_source_get_type ()", cheader_filename = "champlain/champlain.h")]
public class NetworkBboxTileSource : Champlain.TileSource {
- public Champlain.NetworkBboxTileSourcePrivate priv;
+ [CCode (has_construct_function = false)]
+ protected NetworkBboxTileSource ();
[CCode (has_construct_function = false)]
public NetworkBboxTileSource.full (string id, string name, string license, string license_uri, uint min_zoom, uint max_zoom, uint tile_size, Champlain.MapProjection projection, Champlain.Renderer renderer);
public unowned string get_api_uri ();
@@ -331,11 +335,12 @@
public void set_api_uri (string api_uri);
public string api_uri { get; set; }
[NoAccessorMethod]
- public string proxy_uri { get; set; }
+ public string proxy_uri { owned get; set; }
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_network_tile_source_get_type ()", cheader_filename = "champlain/champlain.h")]
public class NetworkTileSource : Champlain.TileSource {
- public Champlain.NetworkTileSourcePrivate priv;
+ [CCode (has_construct_function = false)]
+ protected NetworkTileSource ();
[CCode (has_construct_function = false)]
public NetworkTileSource.full (string id, string name, string license, string license_uri, uint min_zoom, uint max_zoom, uint tile_size, Champlain.MapProjection projection, string uri_format, Champlain.Renderer renderer);
public bool get_offline ();
@@ -348,14 +353,15 @@
public string proxy_uri { get; set; }
public string uri_format { get; set construct; }
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_null_tile_source_get_type ()", cheader_filename = "champlain/champlain.h")]
public class NullTileSource : Champlain.TileSource {
[CCode (has_construct_function = false)]
+ protected NullTileSource ();
+ [CCode (has_construct_function = false)]
public NullTileSource.full (Champlain.Renderer renderer);
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_path_layer_get_type ()", cheader_filename = "champlain/champlain.h")]
public class PathLayer : Champlain.Layer, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
- public Champlain.PathLayerPrivate priv;
[CCode (has_construct_function = false)]
public PathLayer ();
public void add_node (Champlain.Location location);
@@ -385,9 +391,8 @@
public double stroke_width { get; set; }
public bool visible { get; set; }
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_point_get_type ()", cheader_filename = "champlain/champlain.h")]
public class Point : Champlain.Marker, Atk.Implementor, Champlain.Location, Clutter.Animatable, Clutter.Scriptable {
- public Champlain.PointPrivate priv;
[CCode (type = "ClutterActor*", has_construct_function = false)]
public Point ();
[CCode (type = "ClutterActor*", has_construct_function = false)]
@@ -399,14 +404,15 @@
public Clutter.Color color { get; set; }
public double size { get; set; }
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_renderer_get_type ()", cheader_filename = "champlain/champlain.h")]
public class Renderer : GLib.InitiallyUnowned {
+ [CCode (has_construct_function = false)]
+ protected Renderer ();
public virtual void render (Champlain.Tile tile);
public virtual void set_data (string data, uint size);
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_scale_get_type ()", cheader_filename = "champlain/champlain.h")]
public class Scale : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
- public Champlain.ScalePrivate priv;
[CCode (type = "ClutterActor*", has_construct_function = false)]
public Scale ();
public void connect_view (Champlain.View view);
@@ -417,9 +423,8 @@
public void set_unit (Champlain.Unit unit);
public uint max_width { get; set; }
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_tile_get_type ()", cheader_filename = "champlain/champlain.h")]
public class Tile : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
- public Champlain.TilePrivate priv;
[CCode (has_construct_function = false)]
public Tile ();
public void display_content ();
@@ -452,16 +457,18 @@
public uint zoom_level { get; set; }
public signal void render_complete (void* data, uint size, bool error);
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_tile_cache_get_type ()", cheader_filename = "champlain/champlain.h")]
public class TileCache : Champlain.MapSource {
- public Champlain.TileCachePrivate priv;
+ [CCode (has_construct_function = false)]
+ protected TileCache ();
public virtual void on_tile_filled (Champlain.Tile tile);
public virtual void refresh_tile_time (Champlain.Tile tile);
public virtual void store_tile (Champlain.Tile tile, string contents, size_t size);
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_tile_source_get_type ()", cheader_filename = "champlain/champlain.h")]
public class TileSource : Champlain.MapSource {
- public Champlain.TileSourcePrivate priv;
+ [CCode (has_construct_function = false)]
+ protected TileSource ();
public unowned Champlain.TileCache get_cache ();
public void set_cache (Champlain.TileCache cache);
public void set_id (string id);
@@ -474,23 +481,22 @@
public void set_tile_size (uint tile_size);
public Champlain.TileCache cache { get; set; }
[NoAccessorMethod]
- public string id { get; set construct; }
+ public string id { owned get; set construct; }
[NoAccessorMethod]
- public string license { get; set construct; }
+ public string license { owned get; set construct; }
[NoAccessorMethod]
- public string license_uri { get; set construct; }
+ public string license_uri { owned get; set construct; }
[NoAccessorMethod]
public uint max_zoom_level { get; set construct; }
[NoAccessorMethod]
public uint min_zoom_level { get; set construct; }
[NoAccessorMethod]
- public string name { get; set construct; }
+ public string name { owned get; set construct; }
[NoAccessorMethod]
public uint tile_size { get; set construct; }
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_view_get_type ()", cheader_filename = "champlain/champlain.h")]
public class View : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
- public Champlain.ViewPrivate priv;
[CCode (type = "ClutterActor*", has_construct_function = false)]
public View ();
public void add_layer (Champlain.Layer layer);
@@ -544,9 +550,8 @@
public signal void animation_completed ();
public signal void layer_relocated ();
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (type_id = "champlain_viewport_get_type ()", cheader_filename = "champlain/champlain.h")]
public class Viewport : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
- public Champlain.ViewportPrivate priv;
[CCode (type = "ClutterActor*", has_construct_function = false)]
public Viewport ();
public void get_adjustments (Champlain.Adjustment hadjustment, Champlain.Adjustment vadjustment);
@@ -556,17 +561,17 @@
public void set_origin (float x, float y);
public void stop ();
[NoAccessorMethod]
- public Champlain.Adjustment hadjustment { get; set; }
+ public Champlain.Adjustment hadjustment { owned get; set; }
[NoAccessorMethod]
public bool sync_adjustments { get; set; }
[NoAccessorMethod]
- public Champlain.Adjustment vadjustment { get; set; }
+ public Champlain.Adjustment vadjustment { owned get; set; }
[NoAccessorMethod]
public int x_origin { get; set; }
[NoAccessorMethod]
public int y_origin { get; set; }
}
- [CCode (cheader_filename = "champlain/champlain.h")]
+ [CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_location_get_type ()")]
public interface Location : GLib.Object {
public abstract double get_latitude ();
public abstract double get_longitude ();
@@ -574,60 +579,6 @@
public double latitude { get; set; }
public double longitude { get; set; }
}
- [CCode (type_id = "CHAMPLAIN_TYPE_ADJUSTMENT_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct AdjustmentPrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_COORDINATE_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct CoordinatePrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_CUSTOM_MARKER_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct CustomMarkerPrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_ERROR_TILE_RENDERER_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct ErrorTileRendererPrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_FILE_CACHE_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct FileCachePrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_FILE_TILE_SOURCE_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct FileTileSourcePrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_IMAGE_RENDERER_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct ImageRendererPrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_KINETIC_SCROLL_VIEW_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct KineticScrollViewPrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_LABEL_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct LabelPrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_LICENSE_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct LicensePrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_MAP_SOURCE_CHAIN_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct MapSourceChainPrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_MAP_SOURCE_DESC_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct MapSourceDescPrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_MAP_SOURCE_FACTORY_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct MapSourceFactoryPrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_MAP_SOURCE_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct MapSourcePrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_MARKER_LAYER_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct MarkerLayerPrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_MARKER_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct MarkerPrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_MEMORY_CACHE_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct MemoryCachePrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_MEMPHIS_RENDERER_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct MemphisRendererPrivate {
- }
[CCode (type_id = "CHAMPLAIN_TYPE_MEMPHIS_RULE", cheader_filename = "champlain/champlain.h")]
public struct MemphisRule {
public weak string keys;
@@ -649,39 +600,6 @@
public weak string style;
public double size;
}
- [CCode (type_id = "CHAMPLAIN_TYPE_NETWORK_BBOX_TILE_SOURCE_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct NetworkBboxTileSourcePrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_NETWORK_TILE_SOURCE_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct NetworkTileSourcePrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_NULL_TILE_SOURCE_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct NullTileSourcePrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_PATH_LAYER_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct PathLayerPrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_POINT_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct PointPrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_SCALE_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct ScalePrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_TILE_CACHE_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct TileCachePrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_TILE_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct TilePrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_TILE_SOURCE_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct TileSourcePrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_VIEW_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct ViewPrivate {
- }
- [CCode (type_id = "CHAMPLAIN_TYPE_VIEWPORT_PRIVATE", cheader_filename = "champlain/champlain.h")]
- public struct ViewportPrivate {
- }
[CCode (cprefix = "CHAMPLAIN_MAP_PROJECTION_", cheader_filename = "champlain/champlain.h")]
public enum MapProjection {
[CCode (cname = "CHAMPLAIN_MAP_PROJECTION_MERCATOR")]
--- champlain-vala-0.12/champlain-gtk-0.10.vapi 2011-04-08 09:49:24.537684650 +0200
+++ champlain-vala-git/champlain-gtk-0.10.vapi 2011-04-08 23:24:29.287222279 +0200
@@ -2,16 +2,12 @@
[CCode (cprefix = "GtkChamplain", lower_case_cprefix = "gtk_champlain_", gir_namespace = "GtkChamplain", gir_version = "0.10")]
namespace GtkChamplain {
- [CCode (cheader_filename = "champlain-gtk/champlain-gtk.h")]
+ [CCode (type_id = "gtk_champlain_embed_get_type ()", cheader_filename = "champlain-gtk/champlain-gtk.h")]
public class Embed : Gtk.Alignment, Atk.Implementor, Gtk.Buildable {
- public GtkChamplain.EmbedPrivate priv;
[CCode (type = "GtkWidget*", has_construct_function = false)]
public Embed ();
public unowned Champlain.View get_view ();
[NoAccessorMethod]
- public Champlain.View champlain_view { get; }
- }
- [CCode (type_id = "GTK_CHAMPLAIN_TYPE_EMBED_PRIVATE", cheader_filename = "champlain-gtk/champlain-gtk.h")]
- public struct EmbedPrivate {
+ public Champlain.View champlain_view { owned get; }
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
