Update the managed bindings

diff --git a/bindings/managed/champlain-gtk/champlain-gtk-api.raw b/bindings/managed/champlain-gtk/champlain-gtk-api.raw
index 5ae6ac292bc64016ae3f05e901a42d22d93a8f64..020c33c8e5f45af18a58ce0e5fbf30c1e927b5b5 100644 (file)
--- a/bindings/managed/champlain-gtk/champlain-gtk-api.raw
+++ b/bindings/managed/champlain-gtk/champlain-gtk-api.raw
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<api>
+<api parser_version="2">
   <!--
 
         This file was automatically generated.
@@ -8,6 +8,9 @@
 -->
   <namespace name="Champlain" library="champlain-gtk">
     <object name="ViewEmbed" cname="ChamplainViewEmbed" parent="GtkAlignment">
+      <class_struct cname="ChamplainViewEmbedClass">
+        <field name="ParentClass" cname="parent_class" type="GtkAlignmentClass" />
+      </class_struct>
       <field name="Priv" cname="priv" type="ChamplainViewEmbedPrivate*" />
       <property name="ChamplainView" cname="champlain-view" type="ChamplainView" readable="true" writeable="true" construct="true" />
       <method name="GetType" cname="champlain_view_embed_get_type" shared="true">

diff --git a/bindings/managed/champlain/champlain-api.raw b/bindings/managed/champlain/champlain-api.raw
index 2450dab8b52b96311db714c4333708ea2f05d3dc..4c3aa424ec3cc9a11b5d248fb5537f97f6991f48 100644 (file)
--- a/bindings/managed/champlain/champlain-api.raw
+++ b/bindings/managed/champlain/champlain-api.raw
@@ -26,6 +26,22 @@
       <member cname="CHAMPLAIN_STATE_LOADING" name="Loading" />
       <member cname="CHAMPLAIN_STATE_DONE" name="Done" />
     </enum>
+    <object name="BaseMarker" cname="ChamplainBaseMarker" parent="ClutterGroup">
+      <field name="Priv" cname="priv" type="ChamplainBaseMarkerPrivate*" />
+      <property name="Longitude" cname="longitude" type="gdouble" readable="true" writeable="true" />
+      <property name="Latitude" cname="latitude" type="gdouble" readable="true" writeable="true" />
+      <method name="GetType" cname="champlain_base_marker_get_type" shared="true">
+        <return-type type="GType" />
+      </method>
+      <constructor cname="champlain_base_marker_new" />
+      <method name="SetPosition" cname="champlain_base_marker_set_position">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="gdouble" name="longitude" />
+          <parameter type="gdouble" name="latitude" />
+        </parameters>
+      </method>
+    </object>
     <object name="Layer" cname="ChamplainLayer" parent="ClutterGroup">
       <method name="GetType" cname="champlain_layer_get_type" shared="true">
         <return-type type="GType" />
@@ -63,6 +79,9 @@
           <parameter type="guint" name="y" />
         </parameters>
       </method>
+      <method name="GetLicense" cname="champlain_map_source_get_license">
+        <return-type type="const-gchar*" />
+      </method>
       <method name="GetLongitude" cname="champlain_map_source_get_longitude">
         <return-type type="gdouble" />
         <parameters>
@@ -115,45 +134,183 @@
       </method>
       <constructor cname="champlain_map_source_new_mff_relief" />
       <constructor cname="champlain_map_source_new_oam" />
+      <constructor cname="champlain_map_source_new_osm_cyclemap" />
       <constructor cname="champlain_map_source_new_osm_mapnik" />
+      <constructor cname="champlain_map_source_new_osm_osmarender" />
+      <method name="SetLicense" cname="champlain_map_source_set_license">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="const-gchar*" name="license" />
+        </parameters>
+      </method>
+      <method name="SetName" cname="champlain_map_source_set_name">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="const-gchar*" name="name" />
+        </parameters>
+      </method>
     </object>
-    <object name="Marker" cname="ChamplainMarker" parent="ClutterGroup">
+    <object name="Marker" cname="ChamplainMarker" parent="ChamplainBaseMarker">
       <field name="Priv" cname="priv" type="ChamplainMarkerPrivate*" />
-      <property name="Longitude" cname="longitude" type="gdouble" readable="true" writeable="true" />
-      <property name="Latitude" cname="latitude" type="gdouble" readable="true" writeable="true" />
+      <property name="Text" cname="text" type="gchar*" readable="true" writeable="true" />
+      <property name="Image" cname="image" type="ClutterActor" readable="true" writeable="true" />
+      <property name="UseMarkup" cname="use-markup" type="gboolean" readable="true" writeable="true" />
+      <property name="Alignment" cname="alignment" type="PangoAlignment" readable="true" writeable="true" />
+      <property name="" cname="" type="class" />
+      <property name="" cname="" type="class" />
+      <property name="FontName" cname="font-name" type="gchar*" readable="true" writeable="true" />
+      <property name="Wrap" cname="wrap" type="gboolean" readable="true" writeable="true" />
+      <property name="WrapMode" cname="wrap-mode" type="PangoWrapMode" readable="true" writeable="true" />
+      <property name="Ellipsize" cname="ellipsize" type="PangoEllipsizeMode" readable="true" writeable="true" />
+      <property name="DrawBackground" cname="draw-background" type="gboolean" readable="true" writeable="true" />
+      <property name="SingleLineMode" cname="single-line-mode" type="gboolean" readable="true" writeable="true" />
+      <virtual_method name="DrawMarker" cname="draw_marker">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="ChamplainMarker*" name="marker" />
+        </parameters>
+      </virtual_method>
+      <method name="GetAlignment" cname="champlain_marker_get_alignment">
+        <return-type type="PangoAlignment" />
+      </method>
+      <method name="GetColor" cname="champlain_marker_get_color">
+        <return-type type="ClutterColor*" />
+      </method>
+      <method name="GetDrawBackground" cname="champlain_marker_get_draw_background">
+        <return-type type="gboolean" />
+      </method>
+      <method name="GetEllipsize" cname="champlain_marker_get_ellipsize">
+        <return-type type="PangoEllipsizeMode" />
+      </method>
+      <method name="GetFontName" cname="champlain_marker_get_font_name">
+        <return-type type="const-gchar*" />
+      </method>
+      <method name="GetImage" cname="champlain_marker_get_image">
+        <return-type type="ClutterActor*" />
+      </method>
+      <method name="GetSingleLineMode" cname="champlain_marker_get_single_line_mode">
+        <return-type type="gboolean" />
+      </method>
+      <method name="GetText" cname="champlain_marker_get_text">
+        <return-type type="const-gchar*" />
+      </method>
+      <method name="GetTextColor" cname="champlain_marker_get_text_color">
+        <return-type type="ClutterColor*" />
+      </method>
       <method name="GetType" cname="champlain_marker_get_type" shared="true">
         <return-type type="GType" />
       </method>
+      <method name="GetUseMarkup" cname="champlain_marker_get_use_markup">
+        <return-type type="gboolean" />
+      </method>
+      <method name="GetWrap" cname="champlain_marker_get_wrap">
+        <return-type type="gboolean" />
+      </method>
+      <method name="GetWrapMode" cname="champlain_marker_get_wrap_mode">
+        <return-type type="PangoWrapMode" />
+      </method>
       <constructor cname="champlain_marker_new" />
-      <constructor cname="champlain_marker_new_with_image">
+      <constructor cname="champlain_marker_new_from_file">
         <parameters>
           <parameter type="const-gchar*" name="filename" />
           <parameter type="GError**" name="error" />
         </parameters>
       </constructor>
-      <constructor cname="champlain_marker_new_with_image_full">
+      <constructor cname="champlain_marker_new_full">
         <parameters>
-          <parameter type="const-gchar*" name="filename" />
-          <parameter type="gint" name="width" />
-          <parameter type="gint" name="height" />
-          <parameter type="gint" name="anchor_x" />
-          <parameter type="gint" name="anchor_y" />
-          <parameter type="GError**" name="error" />
+          <parameter type="const-gchar*" name="text" />
+          <parameter type="ClutterActor*" name="actor" />
+        </parameters>
+      </constructor>
+      <constructor cname="champlain_marker_new_with_image">
+        <parameters>
+          <parameter type="ClutterActor*" name="actor" />
         </parameters>
       </constructor>
-      <constructor cname="champlain_marker_new_with_label">
+      <constructor cname="champlain_marker_new_with_text">
         <parameters>
-          <parameter type="const-gchar*" name="label" />
+          <parameter type="const-gchar*" name="text" />
           <parameter type="const-gchar*" name="font" />
           <parameter type="ClutterColor*" name="text_color" />
           <parameter type="ClutterColor*" name="marker_color" />
         </parameters>
       </constructor>
-      <method name="SetPosition" cname="champlain_marker_set_position">
+      <method name="SetAlignment" cname="champlain_marker_set_alignment">
         <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="longitude" />
-          <parameter type="gdouble" name="latitude" />
+          <parameter type="PangoAlignment" name="alignment" />
+        </parameters>
+      </method>
+      <method name="SetAttributes" cname="champlain_marker_set_attributes">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="PangoAttrList*" name="list" />
+        </parameters>
+      </method>
+      <method name="SetColor" cname="champlain_marker_set_color">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="const-ClutterColor*" name="color" />
+        </parameters>
+      </method>
+      <method name="SetDrawBackground" cname="champlain_marker_set_draw_background">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="gboolean" name="wrap" />
+        </parameters>
+      </method>
+      <method name="SetEllipsize" cname="champlain_marker_set_ellipsize">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="PangoEllipsizeMode" name="mode" />
+        </parameters>
+      </method>
+      <method name="SetFontName" cname="champlain_marker_set_font_name">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="const-gchar*" name="font_name" />
+        </parameters>
+      </method>
+      <method name="SetImage" cname="champlain_marker_set_image">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="ClutterActor*" name="image" />
+        </parameters>
+      </method>
+      <method name="SetSingleLineMode" cname="champlain_marker_set_single_line_mode">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="gboolean" name="mode" />
+        </parameters>
+      </method>
+      <method name="SetText" cname="champlain_marker_set_text">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="const-gchar*" name="text" />
+        </parameters>
+      </method>
+      <method name="SetTextColor" cname="champlain_marker_set_text_color">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="const-ClutterColor*" name="color" />
+        </parameters>
+      </method>
+      <method name="SetUseMarkup" cname="champlain_marker_set_use_markup">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="gboolean" name="use_markup" />
+        </parameters>
+      </method>
+      <method name="SetWrap" cname="champlain_marker_set_wrap">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="gboolean" name="wrap" />
+        </parameters>
+      </method>
+      <method name="SetWrapMode" cname="champlain_marker_set_wrap_mode">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="PangoWrapMode" name="wrap_mode" />
         </parameters>
       </method>
     </object>
@@ -184,14 +341,14 @@
       </method>
       <constructor cname="champlain_network_map_source_new_full">
         <parameters>
-          <parameter type="gchar*" name="name" />
-          <parameter type="gchar*" name="license" />
-          <parameter type="gchar*" name="license_uri" />
+          <parameter type="const-gchar*" name="name" />
+          <parameter type="const-gchar*" name="license" />
+          <parameter type="const-gchar*" name="license_uri" />
           <parameter type="guint" name="min_zoom" />
           <parameter type="guint" name="map_zoom" />
           <parameter type="guint" name="tile_size" />
           <parameter type="ChamplainMapProjection" name="projection" />
-          <parameter type="gchar*" name="uri_format" />
+          <parameter type="const-gchar*" name="uri_format" />
         </parameters>
       </constructor>
       <method name="SetTileUri" cname="champlain_network_map_source_set_tile_uri">
@@ -214,7 +371,7 @@
         <return-type type="ClutterActor*" />
       </method>
       <method name="GetFilename" cname="champlain_tile_get_filename">
-        <return-type type="gchar*" />
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetSize" cname="champlain_tile_get_size">
         <return-type type="guint" />
@@ -226,7 +383,7 @@
         <return-type type="GType" />
       </method>
       <method name="GetUri" cname="champlain_tile_get_uri">
-        <return-type type="gchar*" />
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetX" cname="champlain_tile_get_x">
         <return-type type="gint" />
@@ -255,7 +412,7 @@
       <method name="SetFilename" cname="champlain_tile_set_filename">
         <return-type type="void" />
         <parameters>
-          <parameter type="gchar*" name="filename" />
+          <parameter type="const-gchar*" name="filename" />
         </parameters>
       </method>
       <method name="SetSize" cname="champlain_tile_set_size">
@@ -273,7 +430,7 @@
       <method name="SetUri" cname="champlain_tile_set_uri">
         <return-type type="void" />
         <parameters>
-          <parameter type="gchar*" name="uri" />
+          <parameter type="const-gchar*" name="uri" />
         </parameters>
       </method>
       <method name="SetX" cname="champlain_tile_set_x">
@@ -297,18 +454,28 @@
     </object>
     <object name="View" cname="ChamplainView" parent="ClutterGroup">
       <field name="Priv" cname="priv" type="ChamplainViewPrivate*" />
-      <property name="Longitude" cname="longitude" type="gfloat" readable="true" writeable="true" />
-      <property name="Latitude" cname="latitude" type="gfloat" readable="true" writeable="true" />
+      <property name="Longitude" cname="longitude" type="gdouble" readable="true" writeable="true" />
+      <property name="Latitude" cname="latitude" type="gdouble" readable="true" writeable="true" />
       <property name="ZoomLevel" cname="zoom-level" type="gint" readable="true" writeable="true" />
+      <property name="MinZoomLevel" cname="min-zoom-level" type="gint" readable="true" writeable="true" />
+      <property name="MaxZoomLevel" cname="max-zoom-level" type="gint" readable="true" writeable="true" />
       <property name="MapSource" cname="map-source" type="ChamplainMapSource" readable="true" writeable="true" />
       <property name="ScrollMode" cname="scroll-mode" type="ChamplainScrollMode" readable="true" writeable="true" />
       <property name="DecelRate" cname="decel-rate" type="gdouble" readable="true" writeable="true" />
       <property name="KeepCenterOnResize" cname="keep-center-on-resize" type="gboolean" readable="true" writeable="true" />
       <property name="ShowLicense" cname="show-license" type="gboolean" readable="true" writeable="true" />
+      <property name="ZoomOnDoubleClick" cname="zoom-on-double-click" type="gboolean" readable="true" writeable="true" />
+      <property name="State" cname="state" type="ChamplainState" readable="true" />
+      <signal name="AnimationCompleted" cname="animation-completed" when="LAST">
+        <return-type type="void" />
+        <parameters>
+          <parameter name="inst" type="ChamplainView*" />
+        </parameters>
+      </signal>
       <method name="AddLayer" cname="champlain_view_add_layer">
         <return-type type="void" />
         <parameters>
-          <parameter type="ClutterActor*" name="layer" />
+          <parameter type="ChamplainLayer*" name="layer" />
         </parameters>
       </method>
       <method name="CenterOn" cname="champlain_view_center_on">
@@ -318,6 +485,23 @@
           <parameter type="gdouble" name="longitude" />
         </parameters>
       </method>
+      <method name="EnsureMarkersVisible" cname="champlain_view_ensure_markers_visible">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="ChamplainBaseMarker*" array="true" name="markers" />
+          <parameter type="gboolean" name="animate" />
+        </parameters>
+      </method>
+      <method name="EnsureVisible" cname="champlain_view_ensure_visible">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="gdouble" name="lat1" />
+          <parameter type="gdouble" name="lon1" />
+          <parameter type="gdouble" name="lat2" />
+          <parameter type="gdouble" name="lon2" />
+          <parameter type="gboolean" name="animate" />
+        </parameters>
+      </method>
       <method name="GetCoordsFromEvent" cname="champlain_view_get_coords_from_event">
         <return-type type="gboolean" />
         <parameters>
@@ -329,13 +513,56 @@
       <method name="GetType" cname="champlain_view_get_type" shared="true">
         <return-type type="GType" />
       </method>
+      <method name="GoTo" cname="champlain_view_go_to">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="gdouble" name="latitude" />
+          <parameter type="gdouble" name="longitude" />
+        </parameters>
+      </method>
       <constructor cname="champlain_view_new" />
+      <method name="SetDecelRate" cname="champlain_view_set_decel_rate">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="gdouble" name="rate" />
+        </parameters>
+      </method>
+      <method name="SetKeepCenterOnResize" cname="champlain_view_set_keep_center_on_resize">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="gboolean" name="value" />
+        </parameters>
+      </method>
       <method name="SetMapSource" cname="champlain_view_set_map_source">
         <return-type type="void" />
         <parameters>
           <parameter type="ChamplainMapSource*" name="map_source" />
         </parameters>
       </method>
+      <method name="SetMaxZoomLevel" cname="champlain_view_set_max_zoom_level">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="gint" name="zoom_level" />
+        </parameters>
+      </method>
+      <method name="SetMinZoomLevel" cname="champlain_view_set_min_zoom_level">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="gint" name="zoom_level" />
+        </parameters>
+      </method>
+      <method name="SetScrollMode" cname="champlain_view_set_scroll_mode">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="ChamplainScrollMode" name="mode" />
+        </parameters>
+      </method>
+      <method name="SetShowLicense" cname="champlain_view_set_show_license">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="gboolean" name="value" />
+        </parameters>
+      </method>
       <method name="SetSize" cname="champlain_view_set_size">
         <return-type type="void" />
         <parameters>
@@ -349,6 +576,15 @@
           <parameter type="gint" name="zoom_level" />
         </parameters>
       </method>
+      <method name="SetZoomOnDoubleClick" cname="champlain_view_set_zoom_on_double_click">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="gboolean" name="value" />
+        </parameters>
+      </method>
+      <method name="StopGoTo" cname="champlain_view_stop_go_to">
+        <return-type type="void" />
+      </method>
       <method name="TileReady" cname="champlain_view_tile_ready">
         <return-type type="void" />
         <parameters>
@@ -365,6 +601,7 @@
       </method>
     </object>
     <object name="ZoomLevel" cname="ChamplainZoomLevel" parent="GObject">
+      <field name="Priv" cname="priv" type="ChamplainZoomLevelPrivate*" />
       <signal name="TileAdded" cname="tile-added" when="LAST">
         <return-type type="void" />
         <parameters>
@@ -393,7 +630,7 @@
         <return-type type="ClutterActor*" />
       </method>
       <method name="GetHeight" cname="champlain_zoom_level_get_height">
-        <return-type type="gint" />
+        <return-type type="guint" />
       </method>
       <method name="GetNthTile" cname="champlain_zoom_level_get_nth_tile">
         <return-type type="ChamplainTile*" />
@@ -405,7 +642,7 @@
         <return-type type="GType" />
       </method>
       <method name="GetWidth" cname="champlain_zoom_level_get_width">
-        <return-type type="gint" />
+        <return-type type="guint" />
       </method>
       <method name="GetZoomLevel" cname="champlain_zoom_level_get_zoom_level">
         <return-type type="gint" />
@@ -417,12 +654,6 @@
           <parameter type="ChamplainTile*" name="tile" />
         </parameters>
       </method>
-      <method name="SetActor" cname="champlain_zoom_level_set_actor">
-        <return-type type="void" />
-        <parameters>
-          <parameter type="ClutterActor*" name="actor" />
-        </parameters>
-      </method>
       <method name="SetHeight" cname="champlain_zoom_level_set_height">
         <return-type type="void" />
         <parameters>