GNOME.org
 

[libchamplain] Regenerate vapi files

commit bbc60d4b6ec0c151fa9d9f1ab6a2bd16a300b9bd
Author: JiÅÃ Techet <techet gmail com>
Date:   Fri Sep 2 22:52:47 2011 +0200

    Regenerate vapi files

 champlain-gtk/champlain-gtk-0.12.vapi |   12 +-
 champlain/champlain-0.12.vapi         |  290 ++++++++++++---------------------
 2 files changed, 109 insertions(+), 193 deletions(-)
---
diff --git a/champlain-gtk/champlain-gtk-0.12.vapi b/champlain-gtk/champlain-gtk-0.12.vapi
index 7883756..befa4af 100644
--- a/champlain-gtk/champlain-gtk-0.12.vapi
+++ b/champlain-gtk/champlain-gtk-0.12.vapi
@@ -1,17 +1,13 @@
 /* champlain-gtk-0.12.vapi generated by vapigen, do not modify. */
 
-[CCode (cprefix = "GtkChamplain", lower_case_cprefix = "gtk_champlain_", gir_namespace = "GtkChamplain", gir_version = "0.12")]
+[CCode (cprefix = "GtkChamplain", gir_namespace = "GtkChamplain", gir_version = "0.12", lower_case_cprefix = "gtk_champlain_")]
 namespace GtkChamplain {
-	[CCode (cheader_filename = "champlain-gtk/champlain-gtk.h")]
+	[CCode (cheader_filename = "champlain-gtk/champlain-gtk.h", type_id = "gtk_champlain_embed_get_type ()")]
 	public class Embed : Gtk.Alignment, Atk.Implementor, Gtk.Buildable {
-		public GtkChamplain.EmbedPrivate priv;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		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; }
 	}
 }
diff --git a/champlain/champlain-0.12.vapi b/champlain/champlain-0.12.vapi
index 0e9dd1a..86784d9 100644
--- a/champlain/champlain-0.12.vapi
+++ b/champlain/champlain-0.12.vapi
@@ -1,10 +1,9 @@
 /* champlain-0.12.vapi generated by vapigen, do not modify. */
 
-[CCode (cprefix = "Champlain", lower_case_cprefix = "champlain_", gir_namespace = "Champlain", gir_version = "0.12")]
+[CCode (cprefix = "Champlain", gir_namespace = "Champlain", gir_version = "0.12", lower_case_cprefix = "champlain_")]
 namespace Champlain {
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_adjustment_get_type ()")]
 	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);
@@ -30,13 +29,15 @@ namespace Champlain {
 		public double value { get; set; }
 		public virtual signal void changed ();
 	}
+	[CCode (cheader_filename = "champlain/champlain.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "champlain_bounding_box_get_type ()")]
 	[Compact]
-	[CCode (copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "champlain_bounding_box_get_type ()", cheader_filename = "champlain/champlain.h")]
 	public class BoundingBox {
 		public double bottom;
 		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 @@ namespace Champlain {
 		public void get_center (out double latitude, out double longitude);
 		public bool is_valid ();
 	}
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_coordinate_get_type ()")]
 	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 (cheader_filename = "champlain/champlain.h", type_id = "champlain_custom_marker_get_type ()")]
 	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)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public CustomMarker ();
 	}
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_error_tile_renderer_get_type ()")]
 	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 (cheader_filename = "champlain/champlain.h", type_id = "champlain_file_cache_get_type ()")]
 	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,22 +79,22 @@ namespace Champlain {
 		public string cache_dir { get; construct; }
 		public uint size_limit { get; set construct; }
 	}
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_file_tile_source_get_type ()")]
 	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 (cheader_filename = "champlain/champlain.h", type_id = "champlain_image_renderer_get_type ()")]
 	public class ImageRenderer : Champlain.Renderer {
-		public Champlain.ImageRendererPrivate priv;
 		[CCode (has_construct_function = false)]
 		public ImageRenderer ();
 	}
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_kinetic_scroll_view_get_type ()")]
 	public class KineticScrollView : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
-		public Champlain.KineticScrollViewPrivate priv;
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public KineticScrollView (bool kinetic);
 		public void stop ();
 		[NoAccessorMethod]
@@ -106,14 +105,13 @@ namespace Champlain {
 		public uint motion_buffer { get; set; }
 		public signal void panning_completed ();
 	}
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_label_get_type ()")]
 	public class Label : Champlain.Marker, Atk.Implementor, Champlain.Location, Clutter.Animatable, Clutter.Scriptable {
-		public Champlain.LabelPrivate priv;
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Label ();
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Label.from_file (string filename) throws GLib.Error;
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Label.full (string text, Clutter.Actor actor);
 		public Pango.Alignment get_alignment ();
 		public Pango.AttrList get_attributes ();
@@ -141,14 +139,12 @@ namespace Champlain {
 		public void set_use_markup (bool use_markup);
 		public void set_wrap (bool wrap);
 		public void set_wrap_mode (Pango.WrapMode wrap_mode);
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Label.with_image (Clutter.Actor actor);
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Label.with_text (string text, string? font, Clutter.Color? text_color, Clutter.Color? label_color);
-		public Pango.Alignment alignment { get; set; }
 		public Clutter.Color color { get; set; }
 		public bool draw_background { get; set; }
-		public Pango.EllipsizeMode ellipsize { get; set; }
 		public string font_name { get; set; }
 		public Clutter.Actor image { get; set; }
 		public bool single_line_mode { get; set; }
@@ -156,17 +152,17 @@ namespace Champlain {
 		public Clutter.Color text_color { get; set; }
 		public bool use_markup { get; set; }
 		public bool wrap { get; set; }
-		public Pango.WrapMode wrap_mode { get; set; }
 	}
-	[CCode (cheader_filename = "champlain/champlain.h")]
-	public class Layer : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
+	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_layer_get_type ()")]
+	public abstract 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 (cheader_filename = "champlain/champlain.h", type_id = "champlain_license_get_type ()")]
 	public class License : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
-		public Champlain.LicensePrivate priv;
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public License ();
 		public void connect_view (Champlain.View view);
 		public void disconnect_view ();
@@ -174,12 +170,12 @@ namespace Champlain {
 		public unowned string get_extra_text ();
 		public void set_alignment (Pango.Alignment alignment);
 		public void set_extra_text (string text);
-		public Pango.Alignment alignment { get; set; }
 		public string extra_text { get; set; }
 	}
-	[CCode (cheader_filename = "champlain/champlain.h")]
-	public class MapSource : GLib.InitiallyUnowned {
-		public Champlain.MapSourcePrivate priv;
+	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_map_source_get_type ()")]
+	public abstract class MapSource : GLib.InitiallyUnowned {
+		[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 +199,17 @@ namespace Champlain {
 		public Champlain.MapSource next_source { get; set; }
 		public Champlain.Renderer renderer { get; set; }
 	}
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_map_source_chain_get_type ()")]
 	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 (cheader_filename = "champlain/champlain.h", type_id = "champlain_map_source_desc_get_type ()")]
 	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 +232,10 @@ namespace Champlain {
 		public uint tile_size { get; construct; }
 		public string uri_format { get; construct; }
 	}
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_map_source_factory_get_type ()")]
 	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 +243,10 @@ namespace Champlain {
 		public GLib.SList<weak Champlain.MapSourceDesc> get_registered ();
 		public bool register (Champlain.MapSourceDesc desc);
 	}
-	[CCode (cheader_filename = "champlain/champlain.h")]
-	public class Marker : Clutter.Actor, Atk.Implementor, Champlain.Location, Clutter.Animatable, Clutter.Scriptable {
-		public Champlain.MarkerPrivate priv;
+	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_marker_get_type ()")]
+	public abstract class Marker : Clutter.Actor, Atk.Implementor, Champlain.Location, Clutter.Animatable, Clutter.Scriptable {
+		[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 +269,8 @@ namespace Champlain {
 		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 (cheader_filename = "champlain/champlain.h", type_id = "champlain_marker_layer_get_type ()")]
 	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 +291,10 @@ namespace Champlain {
 		public void show_all_markers ();
 		public void unselect_all_markers ();
 	}
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_memory_cache_get_type ()")]
 	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 +302,10 @@ namespace Champlain {
 		public void set_size_limit (uint size_limit);
 		public uint size_limit { get; set construct; }
 	}
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_memphis_renderer_get_type ()")]
 	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 +317,14 @@ namespace Champlain {
 		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; }
+		[NoAccessorMethod]
+		public Champlain.BoundingBox bounding_box { owned get; set; }
 		public uint tile_size { get; set; }
 	}
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_network_bbox_tile_source_get_type ()")]
 	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 +332,12 @@ namespace Champlain {
 		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 (cheader_filename = "champlain/champlain.h", type_id = "champlain_network_tile_source_get_type ()")]
 	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 +350,15 @@ namespace Champlain {
 		public string proxy_uri { get; set; }
 		public string uri_format { get; set construct; }
 	}
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_null_tile_source_get_type ()")]
 	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 (cheader_filename = "champlain/champlain.h", type_id = "champlain_path_layer_get_type ()")]
 	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,12 +388,11 @@ namespace Champlain {
 		public double stroke_width { get; set; }
 		public bool visible { get; set; }
 	}
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_point_get_type ()")]
 	public class Point : Champlain.Marker, Atk.Implementor, Champlain.Location, Clutter.Animatable, Clutter.Scriptable {
-		public Champlain.PointPrivate priv;
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Point ();
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Point.full (double size, Clutter.Color color);
 		public Clutter.Color get_color ();
 		public double get_size ();
@@ -399,15 +401,16 @@ namespace Champlain {
 		public Clutter.Color color { get; set; }
 		public double size { get; set; }
 	}
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_renderer_get_type ()")]
 	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 (cheader_filename = "champlain/champlain.h", type_id = "champlain_scale_get_type ()")]
 	public class Scale : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
-		public Champlain.ScalePrivate priv;
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Scale ();
 		public void connect_view (Champlain.View view);
 		public void disconnect_view ();
@@ -417,9 +420,8 @@ namespace Champlain {
 		public void set_unit (Champlain.Unit unit);
 		public uint max_width { get; set; }
 	}
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_tile_get_type ()")]
 	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 +454,18 @@ namespace Champlain {
 		public uint zoom_level { get; set; }
 		public signal void render_complete (void* data, uint size, bool error);
 	}
-	[CCode (cheader_filename = "champlain/champlain.h")]
-	public class TileCache : Champlain.MapSource {
-		public Champlain.TileCachePrivate priv;
+	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_tile_cache_get_type ()")]
+	public abstract class TileCache : Champlain.MapSource {
+		[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")]
-	public class TileSource : Champlain.MapSource {
-		public Champlain.TileSourcePrivate priv;
+	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_tile_source_get_type ()")]
+	public abstract class TileSource : Champlain.MapSource {
+		[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,30 +478,30 @@ namespace Champlain {
 		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 (cheader_filename = "champlain/champlain.h", type_id = "champlain_view_get_type ()")]
 	public class View : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
-		public Champlain.ViewPrivate priv;
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public View ();
 		public void add_layer (Champlain.Layer layer);
 		public void bin_layout_add (Clutter.Actor child, Clutter.BinAlignment x_align, Clutter.BinAlignment y_align);
 		public void center_on (double latitude, double longitude);
 		public void ensure_layers_visible (bool animate);
 		public void ensure_visible (Champlain.BoundingBox bbox, bool animate);
+		public bool get_animate_zoom ();
 		public double get_center_latitude ();
 		public double get_center_longitude ();
 		public double get_deceleration ();
@@ -516,6 +520,7 @@ namespace Champlain {
 		public double longitude_to_x (double longitude);
 		public void reload_tiles ();
 		public void remove_layer (Champlain.Layer layer);
+		public void set_animate_zoom (bool value);
 		public void set_deceleration (double rate);
 		public void set_keep_center_on_resize (bool value);
 		public void set_kinetic_mode (bool kinetic);
@@ -529,6 +534,7 @@ namespace Champlain {
 		public double y_to_latitude (double y);
 		public void zoom_in ();
 		public void zoom_out ();
+		public bool animate_zoom { get; set; }
 		public double deceleration { get; set; }
 		public bool keep_center_on_resize { get; set; }
 		public bool kinetic_mode { get; set; }
@@ -544,10 +550,9 @@ namespace Champlain {
 		public signal void animation_completed ();
 		public signal void layer_relocated ();
 	}
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_viewport_get_type ()")]
 	public class Viewport : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
-		public Champlain.ViewportPrivate priv;
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Viewport ();
 		public void get_adjustments (Champlain.Adjustment hadjustment, Champlain.Adjustment vadjustment);
 		public void get_origin (float x, float y);
@@ -556,79 +561,27 @@ namespace Champlain {
 		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 ();
 		public abstract void set_location (double latitude, double longitude);
+		[NoAccessorMethod]
 		public double latitude { get; set; }
+		[NoAccessorMethod]
 		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")]
+	[CCode (cheader_filename = "champlain/champlain.h")]
 	public struct MemphisRule {
 		public weak string keys;
 		public weak string values;
@@ -638,7 +591,7 @@ namespace Champlain {
 		public Champlain.MemphisRuleAttr border;
 		public Champlain.MemphisRuleAttr text;
 	}
-	[CCode (type_id = "CHAMPLAIN_TYPE_MEMPHIS_RULE_ATTR", cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h")]
 	public struct MemphisRuleAttr {
 		public uint8 z_min;
 		public uint8 z_max;
@@ -649,65 +602,32 @@ namespace Champlain {
 		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")]
+	[CCode (cheader_filename = "champlain/champlain.h", cprefix = "CHAMPLAIN_MAP_PROJECTION_")]
 	public enum MapProjection {
 		[CCode (cname = "CHAMPLAIN_MAP_PROJECTION_MERCATOR")]
 		MAP_PROJECTION_MERCATOR
 	}
-	[CCode (cprefix = "CHAMPLAIN_MEMPHIS_RULE_TYPE_", cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", cprefix = "CHAMPLAIN_MEMPHIS_RULE_TYPE_")]
 	public enum MemphisRuleType {
 		UNKNOWN,
 		NODE,
 		WAY,
 		RELATION
 	}
-	[CCode (cprefix = "CHAMPLAIN_SELECTION_", cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", cprefix = "CHAMPLAIN_SELECTION_")]
 	public enum SelectionMode {
 		NONE,
 		SINGLE,
 		MULTIPLE
 	}
-	[CCode (cprefix = "CHAMPLAIN_STATE_", cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", cprefix = "CHAMPLAIN_STATE_")]
 	public enum State {
 		NONE,
 		LOADING,
 		LOADED,
 		DONE
 	}
-	[CCode (cprefix = "CHAMPLAIN_UNIT_", cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", cprefix = "CHAMPLAIN_UNIT_")]
 	public enum Unit {
 		KM,
 		MILES
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]