diff -Nru libchamplain-0.12.0/champlain/champlain-0.12.vapi libchamplain-0.12.1/champlain/champlain-0.12.vapi
--- libchamplain-0.12.0/champlain/champlain-0.12.vapi	2011-09-17 21:29:54.000000000 +0000
+++ libchamplain-0.12.1/champlain/champlain-0.12.vapi	2011-12-20 01:10:44.000000000 +0000
@@ -143,8 +143,10 @@
 		public Label.with_image (Clutter.Actor actor);
 		[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; }
@@ -152,6 +154,7 @@
 		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", type_id = "champlain_layer_get_type ()")]
 	public abstract class Layer : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
@@ -170,6 +173,7 @@
 		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", type_id = "champlain_map_source_get_type ()")]
@@ -236,9 +240,9 @@
 	public class MapSourceFactory : GLib.Object {
 		[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);
+		public unowned Champlain.MapSource create (string id);
+		public unowned Champlain.MapSource create_cached_source (string id);
+		public unowned Champlain.MapSource create_error_source (uint tile_size);
 		public static Champlain.MapSourceFactory dup_default ();
 		public GLib.SList<weak Champlain.MapSourceDesc> get_registered ();
 		public bool register (Champlain.MapSourceDesc desc);
@@ -363,6 +367,7 @@
 		public PathLayer ();
 		public void add_node (Champlain.Location location);
 		public bool get_closed ();
+		public GLib.List<weak uint> get_dash ();
 		public bool get_fill ();
 		public Clutter.Color get_fill_color ();
 		public GLib.List<weak Champlain.Location> get_nodes ();
@@ -374,6 +379,7 @@
 		public void remove_all ();
 		public void remove_node (Champlain.Location location);
 		public void set_closed (bool value);
+		public void set_dash (GLib.List<uint> dash_pattern);
 		public void set_fill (bool value);
 		public void set_fill_color (Clutter.Color? color);
 		public void set_stroke (bool value);
@@ -632,42 +638,42 @@
 		KM,
 		MILES
 	}
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAJOR_VERSION")]
 	public const int MAJOR_VERSION;
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAP_SOURCE_MEMPHIS_LOCAL")]
 	public const string MAP_SOURCE_MEMPHIS_LOCAL;
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAP_SOURCE_MEMPHIS_NETWORK")]
 	public const string MAP_SOURCE_MEMPHIS_NETWORK;
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAP_SOURCE_MFF_RELIEF")]
 	public const string MAP_SOURCE_MFF_RELIEF;
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAP_SOURCE_OAM")]
 	public const string MAP_SOURCE_OAM;
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAP_SOURCE_OSM_CYCLE_MAP")]
 	public const string MAP_SOURCE_OSM_CYCLE_MAP;
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAP_SOURCE_OSM_MAPNIK")]
 	public const string MAP_SOURCE_OSM_MAPNIK;
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAP_SOURCE_OSM_MAPQUEST")]
 	public const string MAP_SOURCE_OSM_MAPQUEST;
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAP_SOURCE_OSM_OSMARENDER")]
 	public const string MAP_SOURCE_OSM_OSMARENDER;
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAP_SOURCE_OSM_TRANSPORT_MAP")]
 	public const string MAP_SOURCE_OSM_TRANSPORT_MAP;
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAX_LATITUDE")]
 	public const double MAX_LATITUDE;
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAX_LONGITUDE")]
 	public const double MAX_LONGITUDE;
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MICRO_VERSION")]
 	public const int MICRO_VERSION;
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MINOR_VERSION")]
 	public const int MINOR_VERSION;
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MIN_LATITUDE")]
 	public const double MIN_LATITUDE;
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MIN_LONGITUDE")]
 	public const double MIN_LONGITUDE;
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_VERSION")]
 	public const double VERSION;
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_VERSION_HEX")]
 	public const int VERSION_HEX;
-	[CCode (cheader_filename = "champlain/champlain.h")]
+	[CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_VERSION_S")]
 	public const string VERSION_S;
 }
diff -Nru libchamplain-0.12.0/champlain/champlain-label.c libchamplain-0.12.1/champlain/champlain-label.c
--- libchamplain-0.12.0/champlain/champlain-label.c	2011-09-17 20:19:25.000000000 +0000
+++ libchamplain-0.12.1/champlain/champlain-label.c	2011-12-19 22:35:39.000000000 +0000
@@ -782,6 +782,9 @@
   ChamplainMarker *marker = CHAMPLAIN_MARKER (label);
   guint height = 0, point = 0;
   guint total_width = 0, total_height = 0;
+  
+  if (!priv->content_group)
+    return;
 
   if (priv->image != NULL)
     {
diff -Nru libchamplain-0.12.0/champlain/champlain-map-source-factory.c libchamplain-0.12.1/champlain/champlain-map-source-factory.c
--- libchamplain-0.12.0/champlain/champlain-map-source-factory.c	2011-05-15 11:32:40.000000000 +0000
+++ libchamplain-0.12.1/champlain/champlain-map-source-factory.c	2011-12-19 22:39:11.000000000 +0000
@@ -323,7 +323,7 @@
  * The id should not contain any character that can't be in a filename as it
  * will be used as the cache directory name for that map source.
  *
- * Returns: (transfer full): a ready to use #ChamplainMapSource matching the given name, returns
+ * Returns: (transfer none): a ready to use #ChamplainMapSource matching the given name, returns
  * NULL is none match.
  *
  * Since: 0.4
@@ -360,7 +360,7 @@
  *
  * Creates a cached map source.
  *
- * Returns: (transfer full): a ready to use #ChamplainMapSourceChain consisting of
+ * Returns: (transfer none): a ready to use #ChamplainMapSourceChain consisting of
  * #ChamplainMemoryCache, #ChamplainFileCache, #ChamplainMapSource matching the given name, and
  * an error tile source created with champlain_map_source_factory_create_error_source ().
  *
@@ -406,7 +406,7 @@
  *
  * Creates a map source generating error tiles.
  *
- * Returns: (transfer full): a ready to use map source generating error tiles.
+ * Returns: (transfer none): a ready to use map source generating error tiles.
  *
  * Since: 0.8
  */
diff -Nru libchamplain-0.12.0/champlain/champlain-marker.c libchamplain-0.12.1/champlain/champlain-marker.c
--- libchamplain-0.12.0/champlain/champlain-marker.c	2011-09-17 20:19:25.000000000 +0000
+++ libchamplain-0.12.1/champlain/champlain-marker.c	2011-12-19 22:35:23.000000000 +0000
@@ -800,28 +800,13 @@
 }
 
 
-static gboolean
-on_idle (ChamplainMarker *marker)
-{
-  /* Notify the view that the position changed so that the marker's
-   * position is reset, it has to happen on idle as Clutter seems to
-   * set actors position after calling animation_completed */
-  clutter_actor_hide (CLUTTER_ACTOR (marker));
-
-  g_object_notify (G_OBJECT (marker), "latitude");
-  g_object_notify (G_OBJECT (marker), "longitude");
-  return FALSE;
-}
-
-
 static void
 on_animation_completed (G_GNUC_UNUSED ClutterAnimation *animation,
     ChamplainMarker *marker)
 {
-  g_idle_add_full (CLUTTER_PRIORITY_REDRAW,
-      (GSourceFunc) on_idle,
-      g_object_ref (marker),
-      (GDestroyNotify) g_object_unref);
+  clutter_actor_hide (CLUTTER_ACTOR (marker));
+
+  clutter_actor_move_by (CLUTTER_ACTOR (marker), 0, 100);
 }
 
 
@@ -858,6 +843,6 @@
         "scale-x", 2.0, 
         "scale-y", 2.0, 
         NULL);
-  g_signal_connect (animation, "completed",
+  g_signal_connect_after (animation, "completed",
       G_CALLBACK (on_animation_completed), marker);
 }
diff -Nru libchamplain-0.12.0/champlain/champlain-path-layer.c libchamplain-0.12.1/champlain/champlain-path-layer.c
--- libchamplain-0.12.0/champlain/champlain-path-layer.c	2011-09-17 20:19:25.000000000 +0000
+++ libchamplain-0.12.1/champlain/champlain-path-layer.c	2011-12-19 22:38:29.000000000 +0000
@@ -81,6 +81,8 @@
   gboolean stroke;
   gdouble stroke_width;
   gboolean visible;
+  gdouble *dash;
+  guint num_dashes;
 
   ClutterGroup *content_group;
   ClutterActor *path_actor;
@@ -315,6 +317,7 @@
 
   clutter_color_free (priv->stroke_color);
   clutter_color_free (priv->fill_color);
+  g_free (priv->dash);
 
   G_OBJECT_CLASS (champlain_path_layer_parent_class)->finalize (object);
 }
@@ -469,6 +472,8 @@
   priv->stroke_width = 2.0;
   priv->nodes = NULL;
   priv->redraw_scheduled = FALSE;
+  priv->dash = NULL;
+  priv->num_dashes = 0;
 
   priv->fill_color = clutter_color_copy (&DEFAULT_FILL_COLOR);
   priv->stroke_color = clutter_color_copy (&DEFAULT_STROKE_COLOR);
@@ -675,7 +680,7 @@
   priv->redraw_scheduled = FALSE;
 
   /* layer not yet added to the view */
-  if (view == NULL)
+  if (view == NULL || !priv->content_group)
     return FALSE;
 
   clutter_actor_get_size (CLUTTER_ACTOR (view), &width, &height);
@@ -728,6 +733,7 @@
       priv->stroke_color->alpha / 255.0);
 
   cairo_set_line_width (cr, priv->stroke_width);
+  cairo_set_dash(cr, priv->dash, priv->num_dashes, 0);
 
   if (priv->stroke)
     cairo_stroke (cr);
@@ -859,6 +865,8 @@
 
   priv->fill_color = clutter_color_copy (color);
   g_object_notify (G_OBJECT (layer), "fill-color");
+
+  schedule_redraw (layer);
 }
 
 
@@ -907,6 +915,8 @@
 
   priv->stroke_color = clutter_color_copy (color);
   g_object_notify (G_OBJECT (layer), "stroke-color");
+
+  schedule_redraw (layer);
 }
 
 
@@ -946,6 +956,8 @@
 
   layer->priv->stroke = value;
   g_object_notify (G_OBJECT (layer), "stroke");
+
+  schedule_redraw (layer);
 }
 
 
@@ -985,6 +997,8 @@
 
   layer->priv->fill = value;
   g_object_notify (G_OBJECT (layer), "fill");
+
+  schedule_redraw (layer);
 }
 
 
@@ -1024,6 +1038,8 @@
 
   layer->priv->stroke_width = value;
   g_object_notify (G_OBJECT (layer), "stroke-width");
+
+  schedule_redraw (layer);
 }
 
 
@@ -1106,6 +1122,8 @@
 
   layer->priv->closed_path = value;
   g_object_notify (G_OBJECT (layer), "closed");
+
+  schedule_redraw (layer);
 }
 
 
@@ -1126,3 +1144,68 @@
 
   return layer->priv->closed_path;
 }
+
+
+/**
+ * champlain_path_layer_set_dash:
+ * @layer: a #ChamplainPathLayer
+ * @dash_pattern: (element-type guint): list of integer values representing lengths
+ *     of dashes/spaces (see cairo documentation of cairo_set_dash())
+ *
+ * Sets dashed line pattern in a way similar to cairo_set_dash() of cairo. This 
+ * method supports only integer values for segment lengths. The values have to be
+ * passed inside the data pointer of the list (using the GUINT_TO_POINTER conversion)
+ * 
+ * Pass NULL to use solid line.
+ * 
+ * Since: 0.14
+ */
+void
+champlain_path_layer_set_dash (ChamplainPathLayer *layer,
+    GList *dash_pattern)
+{
+  g_return_if_fail (CHAMPLAIN_IS_PATH_LAYER (layer));
+
+  ChamplainPathLayerPrivate *priv = layer->priv;
+  GList *iter;
+  guint i;
+
+  if (priv->dash)
+    g_free (priv->dash);
+  priv->dash = NULL;  
+
+  priv->num_dashes = g_list_length (dash_pattern);
+
+  if (dash_pattern == NULL) 
+    return;
+
+  priv->dash = g_new (gdouble, priv->num_dashes);
+  for (iter = dash_pattern, i = 0; iter != NULL; iter = iter->next, i++)
+    (priv->dash)[i] = (gdouble) GPOINTER_TO_UINT (iter->data);
+}
+
+
+/**
+ * champlain_path_layer_get_dash:
+ * @layer: a #ChamplainPathLayer
+ *
+ * Returns the list of dash segment lengths.
+ * 
+ * Returns: (transfer container) (element-type guint): the list
+ *
+ * Since: 0.14
+ */
+GList *
+champlain_path_layer_get_dash (ChamplainPathLayer *layer)
+{
+  g_return_val_if_fail (CHAMPLAIN_IS_PATH_LAYER (layer), NULL);
+  
+  ChamplainPathLayerPrivate *priv = layer->priv;
+  GList *list = NULL;
+  guint i;
+  
+  for (i = 0; i < priv->num_dashes; i++)
+    list = g_list_append(list, GUINT_TO_POINTER((guint)(priv->dash)[i]));
+  
+  return list;
+}
diff -Nru libchamplain-0.12.0/champlain/champlain-path-layer.h libchamplain-0.12.1/champlain/champlain-path-layer.h
--- libchamplain-0.12.0/champlain/champlain-path-layer.h	2011-05-15 11:32:40.000000000 +0000
+++ libchamplain-0.12.1/champlain/champlain-path-layer.h	2011-12-19 22:38:29.000000000 +0000
@@ -119,6 +119,10 @@
 void champlain_path_layer_set_closed (ChamplainPathLayer *layer,
     gboolean value);
 
+GList *champlain_path_layer_get_dash (ChamplainPathLayer *layer);
+void champlain_path_layer_set_dash (ChamplainPathLayer *layer,
+    GList *dash_pattern);
+
 G_END_DECLS
 
 #endif
diff -Nru libchamplain-0.12.0/champlain/champlain-scale.c libchamplain-0.12.1/champlain/champlain-scale.c
--- libchamplain-0.12.0/champlain/champlain-scale.c	2011-09-17 20:19:25.000000000 +0000
+++ libchamplain-0.12.1/champlain/champlain-scale.c	2011-12-19 22:35:39.000000000 +0000
@@ -330,7 +330,7 @@
 
   priv->redraw_scheduled = FALSE;
 
-  if (!priv->view)
+  if (!priv->view || !priv->content_group)
     return FALSE;
 
   zoom_level = champlain_view_get_zoom_level (priv->view);
@@ -476,6 +476,8 @@
   gfloat width;
   ChamplainScalePrivate *priv = scale->priv;
 
+  clutter_group_remove_all (priv->content_group);
+  
   text = clutter_text_new_with_text ("Sans 9", "X km");
   clutter_actor_set_name (text, "scale-far-label");
   clutter_container_add_actor (CLUTTER_CONTAINER (priv->content_group), text);
diff -Nru libchamplain-0.12.0/champlain/champlain-tile.c libchamplain-0.12.1/champlain/champlain-tile.c
--- libchamplain-0.12.0/champlain/champlain-tile.c	2011-09-17 20:19:25.000000000 +0000
+++ libchamplain-0.12.1/champlain/champlain-tile.c	2011-12-19 22:35:39.000000000 +0000
@@ -858,6 +858,9 @@
 
   ChamplainTilePrivate *priv = self->priv;
 
+  if (!priv->content_group)
+    return;
+
   if (!priv->content_displayed && priv->content_actor)
     clutter_actor_destroy (priv->content_actor);
 
@@ -872,6 +875,9 @@
 fade_in_completed (G_GNUC_UNUSED ClutterAnimation *animation, ChamplainTile *self)
 {
   ChamplainTilePrivate *priv = self->priv;
+  
+  if (!priv->content_group)
+    return;
 
   if (clutter_group_get_n_children (CLUTTER_GROUP (priv->content_group)) > 1)
     clutter_actor_destroy (clutter_group_get_nth_child (CLUTTER_GROUP (priv->content_group), 0));
@@ -894,7 +900,7 @@
   ChamplainTilePrivate *priv = self->priv;
   ClutterAnimation *animation;
 
-  if (!priv->content_actor || priv->content_displayed)
+  if (!priv->content_actor || priv->content_displayed || !priv->content_group)
     return;
 
   clutter_container_add_actor (CLUTTER_CONTAINER (priv->content_group), priv->content_actor);
diff -Nru libchamplain-0.12.0/champlain/champlain-version.h libchamplain-0.12.1/champlain/champlain-version.h
--- libchamplain-0.12.0/champlain/champlain-version.h	2011-09-17 21:29:33.000000000 +0000
+++ libchamplain-0.12.1/champlain/champlain-version.h	2011-12-20 01:10:26.000000000 +0000
@@ -49,14 +49,14 @@
  *
  * The micro version of libchamplain (3, if %CHAMPLAIN_VERSION is 1.2.3)
  */
-#define CHAMPLAIN_MICRO_VERSION   (0)
+#define CHAMPLAIN_MICRO_VERSION   (1)
 
 /**
  * CHAMPLAIN_VERSION:
  *
  * The full version of libchamplain, like 1.2.3
  */
-#define CHAMPLAIN_VERSION         0.12.0
+#define CHAMPLAIN_VERSION         0.12.1
 
 /**
  * CHAMPLAIN_VERSION_S:
@@ -64,7 +64,7 @@
  * The full version of libchamplain, in string form (suited for
  * string concatenation)
  */
-#define CHAMPLAIN_VERSION_S       "0.12.0"
+#define CHAMPLAIN_VERSION_S       "0.12.1"
 
 /**
  * CHAMPLAIN_VERSION_HEX:
diff -Nru libchamplain-0.12.0/champlain/champlain-view.c libchamplain-0.12.1/champlain/champlain-view.c
--- libchamplain-0.12.0/champlain/champlain-view.c	2011-09-17 20:19:25.000000000 +0000
+++ libchamplain-0.12.1/champlain/champlain-view.c	2011-12-19 22:40:25.000000000 +0000
@@ -266,7 +266,6 @@
   priv->viewport_x = x - priv->anchor_x - priv->viewport_width / 2.0;
   priv->viewport_y = y - priv->anchor_y - priv->viewport_height / 2.0;
 
-
   if (relocate || force_relocate)
     {
       g_signal_handlers_block_by_func (priv->viewport, G_CALLBACK (viewport_pos_changed_cb), view);
@@ -525,7 +524,7 @@
 champlain_view_dispose (GObject *object)
 {
   DEBUG_LOG ()
-
+  
   ChamplainView *view = CHAMPLAIN_VIEW (object);
   ChamplainViewPrivate *priv = view->priv;
 
@@ -589,6 +588,9 @@
   DEBUG_LOG ()
 
   ChamplainViewPrivate *priv = view->priv;
+  
+  if (!priv->kinetic_scroll)
+    return FALSE;
 
   clutter_actor_set_size (priv->kinetic_scroll,
       priv->viewport_width,
@@ -659,6 +661,8 @@
 
   clutter_actor_realize (actor);
 
+  clutter_actor_grab_key_focus (priv->kinetic_scroll);
+
   /* Setup the viewport according to the zoom level */
   /* resize_viewport (view); */
 
@@ -1100,8 +1104,6 @@
   g_signal_connect (priv->kinetic_scroll, "button-press-event",
       G_CALLBACK (kinetic_scroll_button_press_cb), view);
 
-  clutter_stage_set_key_focus (CLUTTER_STAGE (clutter_stage_get_default ()),
-      priv->kinetic_scroll);
   g_signal_connect (priv->kinetic_scroll, "key-press-event",
       G_CALLBACK (kinetic_scroll_key_press_cb), view);
 
@@ -2452,19 +2454,36 @@
       GList *children, *child;
       gint size;
       gdouble x_coord, y_coord;
-      gint x_first, y_first;
+      gint x_first, y_first, max_x_end, max_y_end;
 
       size = champlain_map_source_get_tile_size (priv->map_source);
 
       x_coord = priv->viewport_x + priv->anchor_x;
       y_coord = priv->viewport_y + priv->anchor_y;
 
+      if (x_coord < 0)
+        x_coord = 0;
+      if (y_coord < 0)
+        y_coord = 0;
+
       x_first = x_coord / size;
       y_first = y_coord / size;
+      
+      max_x_end = champlain_map_source_get_column_count (priv->map_source, priv->zoom_level);
+      max_y_end = champlain_map_source_get_row_count (priv->map_source, priv->zoom_level);
+
+      if (x_first > max_x_end)
+        x_first = max_x_end;
+      if (y_first > max_y_end)
+        y_first = max_y_end;
 
       priv->anim_start_zoom_level = priv->zoom_level;
-      priv->zoom_actor_longitude = champlain_view_x_to_longitude (view, x_first * size - x_coord);
-      priv->zoom_actor_latitude = champlain_view_y_to_latitude (view, y_first * size - y_coord);
+      priv->zoom_actor_longitude = champlain_map_source_get_longitude (priv->map_source,
+        priv->zoom_level,
+        x_first * size);
+      priv->zoom_actor_latitude = champlain_map_source_get_latitude (priv->map_source,
+        priv->zoom_level,
+        y_first * size);
 
       clutter_group_remove_all (CLUTTER_GROUP (priv->zoom_overlay_actor));
       zoom_actor = clutter_group_new ();
@@ -2484,9 +2503,9 @@
         }
 
       g_list_free (children);
-
-      gdouble deltax = x_first * size - x_coord;
-      gdouble deltay = y_first * size - y_coord;
+      
+      gdouble deltax = x_first * size - priv->viewport_x - priv->anchor_x;
+      gdouble deltay = y_first * size - priv->viewport_y - priv->anchor_y;
       
       clutter_actor_set_position (zoom_actor, deltax, deltay);
       
@@ -2504,6 +2523,8 @@
     {
       clutter_actor_set_opacity (priv->kinetic_scroll, 0);
       
+      clutter_group_remove_all (CLUTTER_GROUP (priv->zoom_layer));
+
       priv->zoom_animation = clutter_actor_animate (CLUTTER_ACTOR (zoom_actor),
                 CLUTTER_EASE_IN_OUT_QUAD,
                 350,
diff -Nru libchamplain-0.12.0/champlain/champlain-viewport.c libchamplain-0.12.1/champlain/champlain-viewport.c
--- libchamplain-0.12.0/champlain/champlain-viewport.c	2011-05-15 11:32:40.000000000 +0000
+++ libchamplain-0.12.1/champlain/champlain-viewport.c	2011-12-19 22:37:24.000000000 +0000
@@ -475,10 +475,12 @@
       else
         {
           ChamplainAdjustment *adjustment;
+          ClutterActor *stage;
           guint width, stage_width, increment;
 
           width = clutter_actor_get_width (CLUTTER_ACTOR (viewport));
-          stage_width = clutter_actor_get_width (clutter_stage_get_default ());
+          stage = clutter_actor_get_stage (CLUTTER_ACTOR (viewport));
+          stage_width =  (stage != NULL) ? clutter_actor_get_width (stage) : 1;
           increment = MAX (1, MIN (stage_width, width));
 
           adjustment = champlain_adjustment_new (priv->x,
@@ -501,10 +503,12 @@
       else
         {
           ChamplainAdjustment *adjustment;
+          ClutterActor *stage;
           guint height, stage_height, increment;
 
           height = clutter_actor_get_height (CLUTTER_ACTOR (viewport));
-          stage_height = clutter_actor_get_height (clutter_stage_get_default ());
+          stage = clutter_actor_get_stage (CLUTTER_ACTOR (viewport));
+          stage_height = (stage != NULL) ? clutter_actor_get_height (stage) : 1;
           increment = MAX (1, MIN (stage_height, height));
 
           adjustment = champlain_adjustment_new (priv->y,
diff -Nru libchamplain-0.12.0/champlain-gtk/Makefile.am libchamplain-0.12.1/champlain-gtk/Makefile.am
--- libchamplain-0.12.0/champlain-gtk/Makefile.am	2011-09-17 20:19:25.000000000 +0000
+++ libchamplain-0.12.1/champlain-gtk/Makefile.am	2011-12-19 22:34:18.000000000 +0000
@@ -49,7 +49,7 @@
 	-no-undefined \
 	-export-symbols-regex ^gtk_champlain_.*
 
-AM_CPPFLAGS = $(GTK_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir) -DCHAMPLAIN_GTK_COMPILATION
+AM_CPPFLAGS = $(DEPS_CFLAGS) $(GTK_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir) -DCHAMPLAIN_GTK_COMPILATION
 
 
 lib_LTLIBRARIES = libchamplain-gtk-@CHAMPLAIN_API_VERSION@.la
diff -Nru libchamplain-0.12.0/champlain-gtk/Makefile.in libchamplain-0.12.1/champlain-gtk/Makefile.in
--- libchamplain-0.12.0/champlain-gtk/Makefile.in	2011-09-17 21:29:17.000000000 +0000
+++ libchamplain-0.12.1/champlain-gtk/Makefile.in	2011-12-20 01:10:12.000000000 +0000
@@ -390,7 +390,7 @@
 	-no-undefined \
 	-export-symbols-regex ^gtk_champlain_.*
 
-AM_CPPFLAGS = $(GTK_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir) -DCHAMPLAIN_GTK_COMPILATION
+AM_CPPFLAGS = $(DEPS_CFLAGS) $(GTK_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir) -DCHAMPLAIN_GTK_COMPILATION
 lib_LTLIBRARIES = libchamplain-gtk-@CHAMPLAIN_API_VERSION@.la
 libchamplain_gtkdir = $(includedir)/libchamplain-gtk-@CHAMPLAIN_API_VERSION@/champlain-gtk
 libchamplain_gtk_HEADERS = $(libchamplain_gtk_headers_public)
diff -Nru libchamplain-0.12.0/ChangeLog libchamplain-0.12.1/ChangeLog
--- libchamplain-0.12.0/ChangeLog	2011-09-17 21:30:55.000000000 +0000
+++ libchamplain-0.12.1/ChangeLog	2011-12-20 01:11:43.000000000 +0000
@@ -1,5 +1,131 @@
 # Generated by Makefile. Do not edit.
 
+commit 2218bf3e82c3ddafb202da18afe0b8c0d3622d70
+Author: Jiří Techet <techet@gmail.com>
+Date:   Tue Dec 20 02:05:41 2011 +0100
+
+    0.12.1
+
+commit cb3f5d7280130ffa01d3165f0bcc72a3dac967b6
+Author: Jiří Techet <techet@gmail.com>
+Date:   Tue Dec 20 01:43:03 2011 +0100
+
+    Update vapi file
+
+commit de7a9fcdb2afeb3a0a436676eed9509d02ae6f0c
+Author: Jiří Techet <techet@gmail.com>
+Date:   Tue Dec 20 01:42:12 2011 +0100
+
+    Update libchamplain-sections with new functions
+
+commit a6601ecd8343e878b32050f1e63c9eda089904ab
+Author: Jiří Techet <techet@gmail.com>
+Date:   Mon Dec 19 23:21:51 2011 +0100
+
+    Fix wrong zoom actor placement at low zoom levels
+
+commit 4b51f4e7699f784cc756239163b5378344a66a6d
+Author: Jiří Techet <techet@gmail.com>
+Date:   Sat Nov 26 00:44:29 2011 +0100
+
+    Don't use (transfer full) for initially unowned objects
+    
+    Transfer full says that the caller should unref the object but
+    in the case of initially unowned objects this means one
+    extra unref and object destruction.
+    
+    More details here:
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=638542
+
+commit 21f2a2a053c5d5cc24651a8aefd8c24357a85223
+Author: Jiří Techet <techet@gmail.com>
+Date:   Mon Nov 21 13:16:29 2011 +0100
+
+    Add description how to run the python demo
+
+commit 294557ea2581b7cd7b26ecf9b2bef0e75c1df826
+Author: Jiří Techet <techet@gmail.com>
+Date:   Mon Nov 21 13:16:10 2011 +0100
+
+    Add dashed line drawing to path layers
+
+commit 074f227ecc5b2b8ac6ba0e04677a5bd8dcfcb4af
+Author: Jiří Techet <techet@gmail.com>
+Date:   Sun Nov 20 18:42:23 2011 +0100
+
+    Get rid of clutter_stage_get_default()
+    
+    It is deprecated in clutter now.
+
+commit 6117e0da34a24b8532067b0a0981e8584c7b2870
+Author: Jiří Techet <techet@gmail.com>
+Date:   Sun Nov 20 16:03:17 2011 +0100
+
+    Replace some deprecated functions
+
+commit 8ca190812387ed370f89677734b9d12e8f8d232d
+Author: Jiří Techet <techet@gmail.com>
+Date:   Sun Nov 20 15:06:43 2011 +0100
+
+    In idle functions check whether ClutterActor was destroyed
+    
+    Clutter actor can be destroyed using clutter_actor_destroy()
+    which causes immediate call of dispose no matter how many
+    refs the given object has. In idle functions we have to check
+    whether this happened to current object (by checking whether
+    some of the referenced objects is NULL) and if so, return from
+    the idle function immediately.
+    
+    This commit also adds one testing example which quickly creates
+    and destroys ChamplainView, which can easily verify the presence
+    of the original bug.
+
+commit 83b363fbef08325ae5561323e7c051f64e36d3e3
+Author: Jiří Techet <techet@gmail.com>
+Date:   Sun Nov 20 00:16:07 2011 +0100
+
+    Don't use idle function when animating markers
+    
+    Use of idle functions is dangerous in clutter because actors
+    can be destroyed by clutter_actor_destroy() even if they are
+    reffed.
+
+commit 366f84b961ab77291fead567b7eedfe8fd0e2b85
+Author: Jiří Techet <techet@gmail.com>
+Date:   Fri Nov 18 02:43:21 2011 +0100
+
+    Some more g_thread_init() removal
+
+commit c117a917f1b4e1dbf0ee375d7ffa01bfce2d86d1
+Author: Jiří Techet <techet@gmail.com>
+Date:   Fri Nov 18 02:34:40 2011 +0100
+
+    Add other dependencies CFLAGS to champlain-gtk AM_CPPFLAGS
+
+commit af4a63486d822f59c05efaae75bbc6b24489aed5
+Author: Jiří Techet <techet@gmail.com>
+Date:   Fri Nov 18 01:21:25 2011 +0100
+
+    Add missing redraws when path properties change
+
+commit 6afb0c5016cd67d86bf3654bda0f596d55b67eb6
+Author: Colin Walters <walters@verbum.org>
+Date:   Thu Nov 3 22:29:37 2011 -0400
+
+    demos: Don't call g_thread_init
+    
+    Doing so now requires linking -lgthread, but it's been pointless
+    since GLib 2.18, which is ancient history now.
+
+commit 7c0da5cbfc8b6570595ade3ef576d1ac07f7537e
+Author: Jiří Techet <techet@gmail.com>
+Date:   Fri Oct 7 00:06:59 2011 +0200
+
+    When re-creating scale, remove all actors first
+    
+    Otherwise the previously inserted actors are still used for redrawing.
+
 commit 95f8327bdab2f80bcb345ab18b6f19fd03533b64
 Author: Jiří Techet <techet@gmail.com>
 Date:   Sat Sep 17 23:28:53 2011 +0200
diff -Nru libchamplain-0.12.0/configure libchamplain-0.12.1/configure
--- libchamplain-0.12.0/configure	2011-09-17 21:29:16.000000000 +0000
+++ libchamplain-0.12.1/configure	2011-12-20 01:10:11.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libchamplain 0.12.0.
+# Generated by GNU Autoconf 2.68 for libchamplain 0.12.1.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=libchamplain>.
 #
@@ -631,8 +631,8 @@
 # Identity of this package.
 PACKAGE_NAME='libchamplain'
 PACKAGE_TARNAME='libchamplain'
-PACKAGE_VERSION='0.12.0'
-PACKAGE_STRING='libchamplain 0.12.0'
+PACKAGE_VERSION='0.12.1'
+PACKAGE_STRING='libchamplain 0.12.1'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=libchamplain'
 PACKAGE_URL='http://projects.gnome.org/libchamplain/'
 
@@ -1449,7 +1449,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libchamplain 0.12.0 to adapt to many kinds of systems.
+\`configure' configures libchamplain 0.12.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1519,7 +1519,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libchamplain 0.12.0:";;
+     short | recursive ) echo "Configuration of libchamplain 0.12.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1664,7 +1664,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libchamplain configure 0.12.0
+libchamplain configure 0.12.1
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1942,7 +1942,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libchamplain $as_me 0.12.0, which was
+It was created by libchamplain $as_me 0.12.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2762,7 +2762,7 @@
 
 # Define the identity of the package.
  PACKAGE='libchamplain'
- VERSION='0.12.0'
+ VERSION='0.12.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12143,13 +12143,13 @@
 # - If binary compatibility has been broken (eg removed or changed interfaces)
 #   change to C+1:0:0
 # - If the interface is the same as the previous version, change to C:R+1:A
-LIBRARY_VERSION=0:1:0
+LIBRARY_VERSION=1:0:1
 CHAMPLAIN_API_VERSION=0.12
 CHAMPLAIN_API_VERSION_NORM=0_12
 CHAMPLAIN_MAJOR_VERSION=0
 CHAMPLAIN_MINOR_VERSION=12
-CHAMPLAIN_MICRO_VERSION=0
-CHAMPLAIN_VERSION=0.12.0
+CHAMPLAIN_MICRO_VERSION=1
+CHAMPLAIN_VERSION=0.12.1
 CHAMPLAIN_MAJORMINOR=0.12
 
 
@@ -14785,7 +14785,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libchamplain $as_me 0.12.0, which was
+This file was extended by libchamplain $as_me 0.12.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14852,7 +14852,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libchamplain config.status 0.12.0
+libchamplain config.status 0.12.1
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff -Nru libchamplain-0.12.0/configure.ac libchamplain-0.12.1/configure.ac
--- libchamplain-0.12.0/configure.ac	2011-09-17 21:21:55.000000000 +0000
+++ libchamplain-0.12.1/configure.ac	2011-12-20 01:09:48.000000000 +0000
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 m4_define([champlain_major_version], [0])
 m4_define([champlain_minor_version], [12])
-m4_define([champlain_micro_version], [0])
+m4_define([champlain_micro_version], [1])
 m4_define([champlain_version],
           [champlain_major_version.champlain_minor_version.champlain_micro_version])
 m4_define([champlain_minor_api_version], [m4_eval(champlain_minor_version + champlain_minor_version%2)])
@@ -36,7 +36,7 @@
 # - If binary compatibility has been broken (eg removed or changed interfaces)
 #   change to C+1:0:0
 # - If the interface is the same as the previous version, change to C:R+1:A
-LIBRARY_VERSION=0:1:0
+LIBRARY_VERSION=1:0:1
 CHAMPLAIN_API_VERSION=champlain_api_version
 CHAMPLAIN_API_VERSION_NORM=champlain_major_version[_]champlain_minor_api_version
 CHAMPLAIN_MAJOR_VERSION=champlain_major_version
diff -Nru libchamplain-0.12.0/debian/changelog libchamplain-0.12.1/debian/changelog
--- libchamplain-0.12.0/debian/changelog	2011-10-14 11:42:06.000000000 +0000
+++ libchamplain-0.12.1/debian/changelog	2012-01-18 07:06:29.000000000 +0000
@@ -1,14 +1,26 @@
-libchamplain (0.12.0-1~oneiric2) oneiric; urgency=low
+libchamplain (0.12.1-1~oneiric1) oneiric; urgency=low
 
-  * Bump vala to 0.14 to avoid FTBFS
+  * Copied from precise
 
- -- Laurent Bigonville <bigon@ubuntu.com>  Fri, 14 Oct 2011 13:41:43 +0200
+ -- Rico Tzschichholz <ricotz@ubuntu.com>  Wed, 18 Jan 2012 08:06:29 +0100
 
-libchamplain (0.12.0-1~oneiric1) oneiric; urgency=low
+libchamplain (0.12.1-1) unstable; urgency=low
 
-  * Upload to the gnome3 team ppa
+  * New upstream release
+    - Adjust .symbols files
+  * Drop debian/source/options: Use default compression for debian tarball
+
+ -- Laurent Bigonville <bigon@debian.org>  Tue, 27 Dec 2011 16:31:05 +0100
+
+libchamplain (0.12.0-2) unstable; urgency=low
+
+  * debian/control.in:
+    - Build-dep against valac-0.14 instead of valac-0.12, mixing different
+      versions leads valac to crash (Closes: #650229)
+    - Move gir package to Section: introspection
+  * debian/watch: Switch to .xz tarballs
 
- -- Laurent Bigonville <bigon@ubuntu.com>  Mon, 03 Oct 2011 18:29:03 +0200
+ -- Laurent Bigonville <bigon@debian.org>  Wed, 14 Dec 2011 16:50:02 +0100
 
 libchamplain (0.12.0-1) unstable; urgency=low
 
diff -Nru libchamplain-0.12.0/debian/control libchamplain-0.12.1/debian/control
--- libchamplain-0.12.0/debian/control	2011-10-14 11:42:15.000000000 +0000
+++ libchamplain-0.12.1/debian/control	2012-01-18 07:06:32.000000000 +0000
@@ -99,6 +99,7 @@
 Architecture: any
 Depends: ${gir:Depends},
          ${misc:Depends}
+Section: introspection
 Description: C library providing ClutterActor to display maps (GObject introspection)
  Libchamplain is a C library providing a ClutterActor to
  display maps.
@@ -177,6 +178,7 @@
 Depends: ${gir:Depends},
          ${misc:Depends},
          ${shlibs:Depends}
+Section: introspection
 Description: Gtk+ widget to display maps (GObject introspection)
  Libchamplain-gtk is a C library aimed to provide a Gtk+ widget
  to display rasterized maps and markers.
diff -Nru libchamplain-0.12.0/debian/control.in libchamplain-0.12.1/debian/control.in
--- libchamplain-0.12.0/debian/control.in	2011-10-14 11:41:29.000000000 +0000
+++ libchamplain-0.12.1/debian/control.in	2011-12-27 14:14:51.000000000 +0000
@@ -94,6 +94,7 @@
 Architecture: any
 Depends: ${gir:Depends},
          ${misc:Depends}
+Section: introspection
 Description: C library providing ClutterActor to display maps (GObject introspection)
  Libchamplain is a C library providing a ClutterActor to
  display maps.
@@ -172,6 +173,7 @@
 Depends: ${gir:Depends},
          ${misc:Depends},
          ${shlibs:Depends}
+Section: introspection
 Description: Gtk+ widget to display maps (GObject introspection)
  Libchamplain-gtk is a C library aimed to provide a Gtk+ widget
  to display rasterized maps and markers.
diff -Nru libchamplain-0.12.0/debian/libchamplain-0.12-0.symbols libchamplain-0.12.1/debian/libchamplain-0.12-0.symbols
--- libchamplain-0.12.0/debian/libchamplain-0.12-0.symbols	2011-09-06 18:08:06.000000000 +0000
+++ libchamplain-0.12.1/debian/libchamplain-0.12-0.symbols	2011-12-27 14:55:38.000000000 +0000
@@ -197,6 +197,7 @@
  champlain_null_tile_source_new_full@Base 0.11.0
  champlain_path_layer_add_node@Base 0.11.0
  champlain_path_layer_get_closed@Base 0.11.0
+ champlain_path_layer_get_dash@Base 0.12.1
  champlain_path_layer_get_fill@Base 0.11.0
  champlain_path_layer_get_fill_color@Base 0.11.0
  champlain_path_layer_get_nodes@Base 0.11.0
@@ -210,6 +211,7 @@
  champlain_path_layer_remove_all@Base 0.11.0
  champlain_path_layer_remove_node@Base 0.11.0
  champlain_path_layer_set_closed@Base 0.11.0
+ champlain_path_layer_set_dash@Base 0.12.1
  champlain_path_layer_set_fill@Base 0.11.0
  champlain_path_layer_set_fill_color@Base 0.11.0
  champlain_path_layer_set_stroke@Base 0.11.0
diff -Nru libchamplain-0.12.0/debian/source/options libchamplain-0.12.1/debian/source/options
--- libchamplain-0.12.0/debian/source/options	2011-04-19 20:14:52.000000000 +0000
+++ libchamplain-0.12.1/debian/source/options	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-compression = "bzip2"
diff -Nru libchamplain-0.12.0/debian/watch libchamplain-0.12.1/debian/watch
--- libchamplain-0.12.0/debian/watch	2011-04-19 20:00:38.000000000 +0000
+++ libchamplain-0.12.1/debian/watch	2011-12-27 14:14:51.000000000 +0000
@@ -1,2 +1,2 @@
 version=3
-http://ftp.gnome.org/pub/GNOME/sources/libchamplain/([\d\.]+)/libchamplain-([\d\.]+)\.tar\.bz2
+http://ftp.gnome.org/pub/GNOME/sources/libchamplain/([\d\.]+)/libchamplain-([\d\.]+)\.tar\.xz
diff -Nru libchamplain-0.12.0/demos/animated-marker.c libchamplain-0.12.1/demos/animated-marker.c
--- libchamplain-0.12.0/demos/animated-marker.c	2011-09-17 20:19:25.000000000 +0000
+++ libchamplain-0.12.1/demos/animated-marker.c	2011-12-19 22:37:24.000000000 +0000
@@ -30,8 +30,6 @@
   ClutterActor *marker;
   ClutterActor *bg;
   ClutterTimeline *timeline;
-  ClutterBehaviour *behaviour;
-  ClutterAlpha *alpha;
   cairo_t *cr;
 
   /* Create the marker */
@@ -86,13 +84,15 @@
   /* Animate the echo circle */
   timeline = clutter_timeline_new (1000);
   clutter_timeline_set_loop (timeline, TRUE);
-  alpha = clutter_alpha_new_full (timeline, CLUTTER_EASE_OUT_SINE);
-
-  behaviour = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 2.0, 2.0);
-  clutter_behaviour_apply (behaviour, bg);
-
-  behaviour = clutter_behaviour_opacity_new (alpha, 255, 0);
-  clutter_behaviour_apply (behaviour, bg);
+  clutter_actor_set_opacity (CLUTTER_ACTOR (bg), 255);
+  clutter_actor_set_scale (CLUTTER_ACTOR (bg), 0.5, 0.5);
+  clutter_actor_animate_with_timeline (CLUTTER_ACTOR (bg),
+      CLUTTER_EASE_OUT_SINE, 
+      timeline, 
+      "opacity", 0, 
+      "scale-x", 2.0, 
+      "scale-y", 2.0, 
+      NULL);
 
   clutter_timeline_start (timeline);
 
@@ -127,12 +127,12 @@
   ChamplainMarkerLayer *layer;
   GpsCallbackData callback_data;
 
-  g_thread_init (NULL);
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 800, 600);
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
   /* Create the map view */
   actor = champlain_view_new ();
@@ -162,6 +162,5 @@
   clutter_actor_show (stage);
   clutter_main ();
 
-  clutter_actor_destroy (actor);
   return 0;
 }
diff -Nru libchamplain-0.12.0/demos/create-destroy-test.c libchamplain-0.12.1/demos/create-destroy-test.c
--- libchamplain-0.12.0/demos/create-destroy-test.c	1970-01-01 00:00:00.000000000 +0000
+++ libchamplain-0.12.1/demos/create-destroy-test.c	2011-12-19 22:37:24.000000000 +0000
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2010 Jiri Techet <techet@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <champlain/champlain.h>
+
+static ClutterActor *stage;
+
+static ClutterActor *
+create_actor ()
+{
+  ClutterActor *actor;
+
+  /* Create the map view */
+  actor = champlain_view_new ();
+  clutter_actor_set_size (CLUTTER_ACTOR (actor), 800, 600);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), actor);
+
+  champlain_view_set_zoom_level (CHAMPLAIN_VIEW (actor), 12);
+  champlain_view_center_on (CHAMPLAIN_VIEW (actor), 45.466, -73.75);
+  
+  return actor;
+}
+
+
+static gboolean
+callback (void *data)
+{
+  static ClutterActor *actor = NULL;
+  
+  if (!actor)
+  {
+    actor = create_actor();
+  }
+  else
+  {
+    clutter_actor_destroy (actor);
+    actor = NULL;
+  }
+  
+  return TRUE;
+}
+
+
+int
+main (int argc, char *argv[])
+{
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
+
+  stage = clutter_stage_new ();
+  clutter_actor_set_size (stage, 800, 600);
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
+
+  g_timeout_add (100, (GSourceFunc) callback, NULL);
+
+  clutter_actor_show (stage);
+  clutter_main ();
+
+  return 0;
+}
diff -Nru libchamplain-0.12.0/demos/launcher.c libchamplain-0.12.1/demos/launcher.c
--- libchamplain-0.12.0/demos/launcher.c	2011-09-17 20:19:25.000000000 +0000
+++ libchamplain-0.12.1/demos/launcher.c	2011-12-19 22:37:24.000000000 +0000
@@ -95,12 +95,12 @@
   ChamplainPathLayer *path;
   gfloat width, total_width = 0;
 
-  g_thread_init (NULL);
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 800, 600);
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
   /* Create the map view */
   actor = champlain_view_new ();
@@ -149,6 +149,5 @@
   clutter_actor_show (stage);
   clutter_main ();
 
-  clutter_actor_destroy (actor);
   return 0;
 }
diff -Nru libchamplain-0.12.0/demos/launcher-gtk.c libchamplain-0.12.1/demos/launcher-gtk.c
--- libchamplain-0.12.0/demos/launcher-gtk.c	2011-05-15 11:32:40.000000000 +0000
+++ libchamplain-0.12.1/demos/launcher-gtk.c	2011-12-19 22:37:07.000000000 +0000
@@ -223,8 +223,8 @@
   ClutterActor *scale;
   ChamplainLicense *license_actor;
 
-  g_thread_init (NULL);
-  gtk_clutter_init (&argc, &argv);
+  if (gtk_clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   /* create the main, top level, window */
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@@ -242,7 +242,7 @@
   g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (on_destroy),
       NULL);
 
-  vbox = gtk_vbox_new (FALSE, 10);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
 
   widget = gtk_champlain_embed_new ();
   view = gtk_champlain_embed_get_view (GTK_CHAMPLAIN_EMBED (widget));
@@ -287,7 +287,7 @@
 
   gtk_widget_set_size_request (widget, 640, 480);
 
-  bbox = gtk_hbox_new (FALSE, 10);
+  bbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
   button = gtk_button_new_from_stock (GTK_STOCK_ZOOM_IN);
   g_signal_connect (button, "clicked", G_CALLBACK (zoom_in), view);
   gtk_container_add (GTK_CONTAINER (bbox), button);
diff -Nru libchamplain-0.12.0/demos/launcher-vala.c libchamplain-0.12.1/demos/launcher-vala.c
--- libchamplain-0.12.0/demos/launcher-vala.c	2011-09-16 22:19:42.000000000 +0000
+++ libchamplain-0.12.1/demos/launcher-vala.c	2011-12-19 22:52:01.000000000 +0000
@@ -1,4 +1,4 @@
-/* launcher-vala.c generated by valac 0.13.4, the Vala compiler
+/* launcher-vala.c generated by valac 0.14.0, the Vala compiler
  * generated from launcher-vala.vala, do not modify */
 
 /*
diff -Nru libchamplain-0.12.0/demos/local-rendering.c libchamplain-0.12.1/demos/local-rendering.c
--- libchamplain-0.12.0/demos/local-rendering.c	2011-05-15 11:32:40.000000000 +0000
+++ libchamplain-0.12.1/demos/local-rendering.c	2011-12-19 22:37:07.000000000 +0000
@@ -237,7 +237,7 @@
   GtkWidget *hbox, *cb, *sb1, *sb2, *sb3;
   GdkColor gcolor;
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 
   gcolor.red = ((guint16) attr->color_red) << 8;
   gcolor.green = ((guint16) attr->color_green) << 8;
@@ -353,7 +353,7 @@
       gtk_table_attach_defaults (GTK_TABLE (table), props, 1, 2, 4, 5);
     }
 
-  GtkWidget *vbox = gtk_hbox_new (TRUE, 0);
+  GtkWidget *vbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 
   button = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
@@ -364,7 +364,7 @@
       G_CALLBACK (rule_apply_cb), renderer);
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
 
-  GtkWidget *mainbox = gtk_vbox_new (FALSE, 0);
+  GtkWidget *mainbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_box_pack_start (GTK_BOX (mainbox), table, FALSE, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (mainbox), vbox, FALSE, FALSE, 0);
 
@@ -730,8 +730,8 @@
 {
   GtkWidget *widget, *hbox, *bbox, *menubox, *button, *viewport, *label;
 
-  g_thread_init (NULL);
-  gtk_clutter_init (&argc, &argv);
+  if (gtk_clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   /* create the main, top level, window */
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@@ -749,13 +749,13 @@
   g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (on_destroy),
       NULL);
 
-  hbox = gtk_hbox_new (FALSE, 10);
-  menubox = gtk_vbox_new (FALSE, 10);
-  memphis_box = gtk_vbox_new (FALSE, 10);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
+  menubox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
+  memphis_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
   gtk_widget_set_no_show_all (memphis_box, TRUE);
-  memphis_net_box = gtk_hbox_new (FALSE, 10);
+  memphis_net_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
   gtk_widget_set_no_show_all (memphis_net_box, TRUE);
-  memphis_local_box = gtk_hbox_new (FALSE, 10);
+  memphis_local_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
   gtk_widget_set_no_show_all (memphis_local_box, TRUE);
 
   widget = gtk_champlain_embed_new ();
@@ -767,7 +767,7 @@
   gtk_widget_set_size_request (widget, 640, 480);
 
   /* first line of buttons */
-  bbox = gtk_hbox_new (FALSE, 10);
+  bbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
   button = gtk_button_new_from_stock (GTK_STOCK_ZOOM_IN);
   g_signal_connect (button, "clicked", G_CALLBACK (zoom_in), champlain_view);
   gtk_container_add (GTK_CONTAINER (bbox), button);
@@ -829,7 +829,7 @@
   gtk_box_pack_start (GTK_BOX (memphis_box), button, FALSE, FALSE, 0);
 
   /* bg chooser */
-  bbox = gtk_hbox_new (FALSE, 10);
+  bbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
 
   label = gtk_label_new (NULL);
   gtk_label_set_markup (GTK_LABEL (label), "Background color");
@@ -844,7 +844,7 @@
 
   /* rules list */
   label = gtk_label_new ("Rules");
-  bbox = gtk_hbox_new (FALSE, 10);
+  bbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
   gtk_box_pack_start (GTK_BOX (bbox), label, FALSE, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (memphis_box), bbox, FALSE, FALSE, 0);
 
diff -Nru libchamplain-0.12.0/demos/Makefile.am libchamplain-0.12.1/demos/Makefile.am
--- libchamplain-0.12.0/demos/Makefile.am	2011-05-15 11:32:40.000000000 +0000
+++ libchamplain-0.12.1/demos/Makefile.am	2011-12-19 22:35:39.000000000 +0000
@@ -1,4 +1,4 @@
-noinst_PROGRAMS = minimal launcher animated-marker polygons url-marker
+noinst_PROGRAMS = minimal launcher animated-marker polygons url-marker create-destroy-test
 
 INCLUDES = -I$(top_srcdir)
 
@@ -21,6 +21,9 @@
 url_marker_CPPFLAGS = $(DEPS_CFLAGS) $(SOUP_CFLAGS)
 url_marker_LDADD = $(SOUP_LIBS) $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
 
+create_destroy_test_SOURCES = create-destroy-test.c
+create_destroy_test_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
+
 if ENABLE_GTK
 noinst_PROGRAMS += minimal-gtk
 minimal_gtk_SOURCES = minimal-gtk.c
diff -Nru libchamplain-0.12.0/demos/Makefile.in libchamplain-0.12.1/demos/Makefile.in
--- libchamplain-0.12.0/demos/Makefile.in	2011-09-17 21:29:17.000000000 +0000
+++ libchamplain-0.12.1/demos/Makefile.in	2011-12-20 01:10:12.000000000 +0000
@@ -36,14 +36,15 @@
 host_triplet = @host@
 noinst_PROGRAMS = minimal$(EXEEXT) launcher$(EXEEXT) \
 	animated-marker$(EXEEXT) polygons$(EXEEXT) url-marker$(EXEEXT) \
-	$(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3)
+	create-destroy-test$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
+	$(am__EXEEXT_3)
 @ENABLE_GTK_TRUE@am__append_1 = minimal-gtk launcher-gtk
 @ENABLE_GTK_TRUE@@ENABLE_MEMPHIS_TRUE@am__append_2 = local-rendering
 @ENABLE_VALA_DEMOS_TRUE@am__append_3 = launcher-vala
 subdir = demos
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	animated_marker_vala.stamp launcher-vala.c \
-	launcher_gtk_vala.stamp launcher_vala.stamp \
+	animated_marker_vala.stamp create_destroy_test_vala.stamp \
+	launcher-vala.c launcher_gtk_vala.stamp launcher_vala.stamp \
 	launcher_vala_vala.stamp local_rendering_vala.stamp \
 	markers-vala.c minimal_gtk_vala.stamp minimal_vala.stamp \
 	polygons_vala.stamp url_marker_vala.stamp
@@ -74,6 +75,10 @@
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
+am_create_destroy_test_OBJECTS = create-destroy-test.$(OBJEXT)
+create_destroy_test_OBJECTS = $(am_create_destroy_test_OBJECTS)
+create_destroy_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
 am_launcher_OBJECTS = launcher.$(OBJEXT) markers.$(OBJEXT)
 launcher_OBJECTS = $(am_launcher_OBJECTS)
 launcher_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -157,12 +162,13 @@
 AM_V_GEN = $(am__v_GEN_$(V))
 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(animated_marker_SOURCES) $(launcher_SOURCES) \
-	$(launcher_gtk_SOURCES) $(launcher_vala_SOURCES) \
-	$(local_rendering_SOURCES) $(minimal_SOURCES) \
-	$(minimal_gtk_SOURCES) $(polygons_SOURCES) \
+SOURCES = $(animated_marker_SOURCES) $(create_destroy_test_SOURCES) \
+	$(launcher_SOURCES) $(launcher_gtk_SOURCES) \
+	$(launcher_vala_SOURCES) $(local_rendering_SOURCES) \
+	$(minimal_SOURCES) $(minimal_gtk_SOURCES) $(polygons_SOURCES) \
 	$(url_marker_SOURCES)
-DIST_SOURCES = $(animated_marker_SOURCES) $(launcher_SOURCES) \
+DIST_SOURCES = $(animated_marker_SOURCES) \
+	$(create_destroy_test_SOURCES) $(launcher_SOURCES) \
 	$(am__launcher_gtk_SOURCES_DIST) \
 	$(am__launcher_vala_SOURCES_DIST) \
 	$(am__local_rendering_SOURCES_DIST) $(minimal_SOURCES) \
@@ -346,6 +352,8 @@
 url_marker_SOURCES = url-marker.c
 url_marker_CPPFLAGS = $(DEPS_CFLAGS) $(SOUP_CFLAGS)
 url_marker_LDADD = $(SOUP_LIBS) $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
+create_destroy_test_SOURCES = create-destroy-test.c
+create_destroy_test_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
 @ENABLE_GTK_TRUE@minimal_gtk_SOURCES = minimal-gtk.c
 @ENABLE_GTK_TRUE@minimal_gtk_CPPFLAGS = $(GTK_CFLAGS)
 @ENABLE_GTK_TRUE@minimal_gtk_LDADD = $(GTK_LIBS) $(DEPS_LIBS) \
@@ -420,6 +428,9 @@
 animated-marker$(EXEEXT): $(animated_marker_OBJECTS) $(animated_marker_DEPENDENCIES) 
 	@rm -f animated-marker$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(animated_marker_OBJECTS) $(animated_marker_LDADD) $(LIBS)
+create-destroy-test$(EXEEXT): $(create_destroy_test_OBJECTS) $(create_destroy_test_DEPENDENCIES) 
+	@rm -f create-destroy-test$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(create_destroy_test_OBJECTS) $(create_destroy_test_LDADD) $(LIBS)
 launcher$(EXEEXT): $(launcher_OBJECTS) $(launcher_DEPENDENCIES) 
 	@rm -f launcher$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(launcher_OBJECTS) $(launcher_LDADD) $(LIBS)
@@ -452,6 +463,7 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/animated-marker.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/create-destroy-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/launcher-vala.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/launcher.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/launcher_gtk-launcher-gtk.Po@am__quote@
@@ -591,6 +603,9 @@
 animated_marker_vala.stamp: $(animated_marker_SOURCES)
 	$(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(animated_marker_SOURCES)
 	$(AM_V_at)touch $@
+create_destroy_test_vala.stamp: $(create_destroy_test_SOURCES)
+	$(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(create_destroy_test_SOURCES)
+	$(AM_V_at)touch $@
 $(srcdir)/launcher-vala.c: $(srcdir)/launcher_vala_vala.stamp
 	@if test -f $@; then :; else \
 	  rm -f $(srcdir)/launcher_vala_vala.stamp; \
@@ -723,6 +738,7 @@
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f animated_marker_vala.stamp
+	-rm -f create_destroy_test_vala.stamp
 	-rm -f launcher-vala.c
 	-rm -f launcher_gtk_vala.stamp
 	-rm -f launcher_vala.stamp
diff -Nru libchamplain-0.12.0/demos/markers-vala.c libchamplain-0.12.1/demos/markers-vala.c
--- libchamplain-0.12.0/demos/markers-vala.c	2011-09-16 22:47:59.000000000 +0000
+++ libchamplain-0.12.1/demos/markers-vala.c	2011-12-19 22:52:01.000000000 +0000
@@ -1,4 +1,4 @@
-/* markers-vala.c generated by valac 0.13.4, the Vala compiler
+/* markers-vala.c generated by valac 0.14.0, the Vala compiler
  * generated from markers-vala.vala, do not modify */
 
 /*
diff -Nru libchamplain-0.12.0/demos/minimal.c libchamplain-0.12.1/demos/minimal.c
--- libchamplain-0.12.0/demos/minimal.c	2011-09-17 20:19:25.000000000 +0000
+++ libchamplain-0.12.1/demos/minimal.c	2011-12-19 22:37:24.000000000 +0000
@@ -23,12 +23,12 @@
 {
   ClutterActor *actor, *stage;
 
-  g_thread_init (NULL);
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 800, 600);
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
   /* Create the map view */
   actor = champlain_view_new ();
@@ -38,7 +38,5 @@
   clutter_actor_show (stage);
   clutter_main ();
 
-  clutter_actor_destroy (actor);
-
   return 0;
 }
diff -Nru libchamplain-0.12.0/demos/minimal-gtk.c libchamplain-0.12.1/demos/minimal-gtk.c
--- libchamplain-0.12.0/demos/minimal-gtk.c	2011-04-04 19:29:01.000000000 +0000
+++ libchamplain-0.12.1/demos/minimal-gtk.c	2011-12-19 22:37:07.000000000 +0000
@@ -29,8 +29,8 @@
   GtkWidget *window, *widget;
 
   /* initialize threads and clutter */
-  g_thread_init (NULL);
-  gtk_clutter_init (&argc, &argv);
+  if (gtk_clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   /* create the top-level window and quit the main loop when it's closed */
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
diff -Nru libchamplain-0.12.0/demos/minimal.py libchamplain-0.12.1/demos/minimal.py
--- libchamplain-0.12.0/demos/minimal.py	2011-05-15 11:32:40.000000000 +0000
+++ libchamplain-0.12.1/demos/minimal.py	2011-12-19 22:38:47.000000000 +0000
@@ -1,5 +1,10 @@
 #!/usr/bin/env python
 
+# To run this example, you need to set the GI_TYPELIB_PATH environment
+# variable to point to the gir directory:
+#
+# export GI_TYPELIB_PATH=$GI_TYPELIB_PATH:/usr/local/lib/girepository-1.0/
+
 from gi.repository import GtkClutter
 GtkClutter.init([])
 from gi.repository import GObject, Gtk, GtkChamplain 
diff -Nru libchamplain-0.12.0/demos/polygons.c libchamplain-0.12.1/demos/polygons.c
--- libchamplain-0.12.0/demos/polygons.c	2011-09-17 20:19:25.000000000 +0000
+++ libchamplain-0.12.1/demos/polygons.c	2011-12-19 22:38:29.000000000 +0000
@@ -83,13 +83,14 @@
   ClutterActor *actor, *stage, *buttons, *button;
   ChamplainPathLayer *layer;
   gfloat width, total_width = 0;;
+  GList *dash = NULL;
 
-  g_thread_init (NULL);
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 800, 600);
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
   /* Create the map view */
   actor = champlain_view_new ();
@@ -131,9 +132,13 @@
   append_point (layer, 45.3994, -73.1877);
   append_point (layer, 45.4000, -73.1815);
   append_point (layer, 45.4151, -73.1218);
-  champlain_path_layer_set_stroke_width (layer, 5.0);
+  champlain_path_layer_set_stroke_width (layer, 4.0);
   champlain_view_add_layer (CHAMPLAIN_VIEW (actor), CHAMPLAIN_LAYER (layer));
 
+  dash = g_list_append(dash, GUINT_TO_POINTER(6));
+  dash = g_list_append(dash, GUINT_TO_POINTER(2));
+  champlain_path_layer_set_dash (layer, dash);
+  
   /* draw a path */
   layer = champlain_path_layer_new ();
   append_point (layer, 45.1386, -73.9196);
@@ -154,6 +159,5 @@
   clutter_actor_show (stage);
   clutter_main ();
 
-  clutter_actor_destroy (actor);
   return 0;
 }
diff -Nru libchamplain-0.12.0/demos/url-marker.c libchamplain-0.12.1/demos/url-marker.c
--- libchamplain-0.12.0/demos/url-marker.c	2011-09-17 20:19:25.000000000 +0000
+++ libchamplain-0.12.1/demos/url-marker.c	2011-12-19 22:37:24.000000000 +0000
@@ -243,12 +243,12 @@
   ChamplainMarkerLayer *layer;
   SoupSession *session;
 
-  g_thread_init (NULL);
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 800, 600);
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
   /* Create the map view */
   view = champlain_view_new ();
@@ -276,6 +276,5 @@
 
   g_object_unref (session);
 
-  clutter_actor_destroy (view);
   return 0;
 }
diff -Nru libchamplain-0.12.0/docs/reference/html/ChamplainMapSourceFactory.html libchamplain-0.12.1/docs/reference/html/ChamplainMapSourceFactory.html
--- libchamplain-0.12.0/docs/reference/html/ChamplainMapSourceFactory.html	2011-09-17 21:30:53.000000000 +0000
+++ libchamplain-0.12.1/docs/reference/html/ChamplainMapSourceFactory.html	2011-12-20 01:11:42.000000000 +0000
@@ -144,7 +144,7 @@
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>a ready to use <a class="link" href="ChamplainMapSource.html" title="ChamplainMapSource"><span class="type">ChamplainMapSource</span></a> matching the given name, returns
-NULL is none match. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
+NULL is none match. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
@@ -175,7 +175,7 @@
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>a ready to use <a class="link" href="ChamplainMapSourceChain.html" title="ChamplainMapSourceChain"><span class="type">ChamplainMapSourceChain</span></a> consisting of
 <a class="link" href="ChamplainMemoryCache.html" title="ChamplainMemoryCache"><span class="type">ChamplainMemoryCache</span></a>, <a class="link" href="ChamplainFileCache.html" title="ChamplainFileCache"><span class="type">ChamplainFileCache</span></a>, <a class="link" href="ChamplainMapSource.html" title="ChamplainMapSource"><span class="type">ChamplainMapSource</span></a> matching the given name, and
-an error tile source created with <a class="link" href="ChamplainMapSourceFactory.html#champlain-map-source-factory-create-error-source" title="champlain_map_source_factory_create_error_source ()"><code class="function">champlain_map_source_factory_create_error_source()</code></a>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
+an error tile source created with <a class="link" href="ChamplainMapSourceFactory.html#champlain-map-source-factory-create-error-source" title="champlain_map_source_factory_create_error_source ()"><code class="function">champlain_map_source_factory_create_error_source()</code></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
@@ -204,7 +204,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a ready to use map source generating error tiles. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
+<td>a ready to use map source generating error tiles. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
diff -Nru libchamplain-0.12.0/docs/reference/html/ChamplainPathLayer.html libchamplain-0.12.1/docs/reference/html/ChamplainPathLayer.html
--- libchamplain-0.12.0/docs/reference/html/ChamplainPathLayer.html	2011-09-17 21:30:53.000000000 +0000
+++ libchamplain-0.12.1/docs/reference/html/ChamplainPathLayer.html	2011-12-20 01:11:42.000000000 +0000
@@ -80,6 +80,9 @@
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="ChamplainPathLayer.html#champlain-path-layer-get-closed" title="champlain_path_layer_get_closed ()">champlain_path_layer_get_closed</a>     (<em class="parameter"><code><a class="link" href="ChamplainPathLayer.html" title="ChamplainPathLayer"><span class="type">ChamplainPathLayer</span></a> *layer</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="ChamplainPathLayer.html#champlain-path-layer-set-closed" title="champlain_path_layer_set_closed ()">champlain_path_layer_set_closed</a>     (<em class="parameter"><code><a class="link" href="ChamplainPathLayer.html" title="ChamplainPathLayer"><span class="type">ChamplainPathLayer</span></a> *layer</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> value</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             <a class="link" href="ChamplainPathLayer.html#champlain-path-layer-get-dash" title="champlain_path_layer_get_dash ()">champlain_path_layer_get_dash</a>       (<em class="parameter"><code><a class="link" href="ChamplainPathLayer.html" title="ChamplainPathLayer"><span class="type">ChamplainPathLayer</span></a> *layer</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="ChamplainPathLayer.html#champlain-path-layer-set-dash" title="champlain_path_layer_set_dash ()">champlain_path_layer_set_dash</a>       (<em class="parameter"><code><a class="link" href="ChamplainPathLayer.html" title="ChamplainPathLayer"><span class="type">ChamplainPathLayer</span></a> *layer</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *dash_pattern</code></em>);
 </pre>
 </div>
 <div class="refsect1">
@@ -606,6 +609,61 @@
 </table></div>
 <p class="since">Since 0.10</p>
 </div>
+<hr>
+<div class="refsect2">
+<a name="champlain-path-layer-get-dash"></a><h3>champlain_path_layer_get_dash ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             champlain_path_layer_get_dash       (<em class="parameter"><code><a class="link" href="ChamplainPathLayer.html" title="ChamplainPathLayer"><span class="type">ChamplainPathLayer</span></a> *layer</code></em>);</pre>
+<p>
+Returns the list of dash segment lengths.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>layer</code></em> :</span></p></td>
+<td>a <a class="link" href="ChamplainPathLayer.html" title="ChamplainPathLayer"><span class="type">ChamplainPathLayer</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the list. <span class="annotation">[<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> guint]</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.14</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="champlain-path-layer-set-dash"></a><h3>champlain_path_layer_set_dash ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                champlain_path_layer_set_dash       (<em class="parameter"><code><a class="link" href="ChamplainPathLayer.html" title="ChamplainPathLayer"><span class="type">ChamplainPathLayer</span></a> *layer</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *dash_pattern</code></em>);</pre>
+<p>
+Sets dashed line pattern in a way similar to <a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-set-dash"><code class="function">cairo_set_dash()</code></a> of cairo. This 
+method supports only integer values for segment lengths. The values have to be
+passed inside the data pointer of the list (using the GUINT_TO_POINTER conversion)
+</p>
+<p>
+Pass NULL to use solid line.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>layer</code></em> :</span></p></td>
+<td>a <a class="link" href="ChamplainPathLayer.html" title="ChamplainPathLayer"><span class="type">ChamplainPathLayer</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>dash_pattern</code></em> :</span></p></td>
+<td>list of integer values representing lengths
+of dashes/spaces (see cairo documentation of <a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-set-dash"><code class="function">cairo_set_dash()</code></a>). <span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> guint]</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.14</p>
+</div>
 </div>
 <div class="refsect1">
 <a name="ChamplainPathLayer.property-details"></a><h2>Property Details</h2>
diff -Nru libchamplain-0.12.0/docs/reference/html/index.html libchamplain-0.12.1/docs/reference/html/index.html
--- libchamplain-0.12.0/docs/reference/html/index.html	2011-09-17 21:30:53.000000000 +0000
+++ libchamplain-0.12.1/docs/reference/html/index.html	2011-12-20 01:11:42.000000000 +0000
@@ -16,7 +16,7 @@
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libchamplain Reference Manual</p></th></tr></table></div>
 <div>
 <p class="releaseinfo">
-      for libchamplain 0.12.0
+      for libchamplain 0.12.1
 
       </p>
 <p>
diff -Nru libchamplain-0.12.0/docs/reference/html/index.sgml libchamplain-0.12.1/docs/reference/html/index.sgml
--- libchamplain-0.12.0/docs/reference/html/index.sgml	2011-09-17 21:30:53.000000000 +0000
+++ libchamplain-0.12.1/docs/reference/html/index.sgml	2011-12-20 01:11:42.000000000 +0000
@@ -130,6 +130,8 @@
 <ANCHOR id="champlain-path-layer-set-visible" href="libchamplain/ChamplainPathLayer.html#champlain-path-layer-set-visible">
 <ANCHOR id="champlain-path-layer-get-closed" href="libchamplain/ChamplainPathLayer.html#champlain-path-layer-get-closed">
 <ANCHOR id="champlain-path-layer-set-closed" href="libchamplain/ChamplainPathLayer.html#champlain-path-layer-set-closed">
+<ANCHOR id="champlain-path-layer-get-dash" href="libchamplain/ChamplainPathLayer.html#champlain-path-layer-get-dash">
+<ANCHOR id="champlain-path-layer-set-dash" href="libchamplain/ChamplainPathLayer.html#champlain-path-layer-set-dash">
 <ANCHOR id="ChamplainPathLayer.property-details" href="libchamplain/ChamplainPathLayer.html#ChamplainPathLayer.property-details">
 <ANCHOR id="ChamplainPathLayer--closed" href="libchamplain/ChamplainPathLayer.html#ChamplainPathLayer--closed">
 <ANCHOR id="ChamplainPathLayer--fill" href="libchamplain/ChamplainPathLayer.html#ChamplainPathLayer--fill">
diff -Nru libchamplain-0.12.0/docs/reference/html/ix01.html libchamplain-0.12.1/docs/reference/html/ix01.html
--- libchamplain-0.12.0/docs/reference/html/ix01.html	2011-09-17 21:30:53.000000000 +0000
+++ libchamplain-0.12.1/docs/reference/html/ix01.html	2011-12-20 01:11:42.000000000 +0000
@@ -596,6 +596,8 @@
 </dt>
 <dt>champlain_path_layer_get_closed, <a class="indexterm" href="ChamplainPathLayer.html#champlain-path-layer-get-closed">champlain_path_layer_get_closed ()</a>
 </dt>
+<dt>champlain_path_layer_get_dash, <a class="indexterm" href="ChamplainPathLayer.html#champlain-path-layer-get-dash">champlain_path_layer_get_dash ()</a>
+</dt>
 <dt>champlain_path_layer_get_fill, <a class="indexterm" href="ChamplainPathLayer.html#champlain-path-layer-get-fill">champlain_path_layer_get_fill ()</a>
 </dt>
 <dt>champlain_path_layer_get_fill_color, <a class="indexterm" href="ChamplainPathLayer.html#champlain-path-layer-get-fill-color">champlain_path_layer_get_fill_color ()</a>
@@ -620,6 +622,8 @@
 </dt>
 <dt>champlain_path_layer_set_closed, <a class="indexterm" href="ChamplainPathLayer.html#champlain-path-layer-set-closed">champlain_path_layer_set_closed ()</a>
 </dt>
+<dt>champlain_path_layer_set_dash, <a class="indexterm" href="ChamplainPathLayer.html#champlain-path-layer-set-dash">champlain_path_layer_set_dash ()</a>
+</dt>
 <dt>champlain_path_layer_set_fill, <a class="indexterm" href="ChamplainPathLayer.html#champlain-path-layer-set-fill">champlain_path_layer_set_fill ()</a>
 </dt>
 <dt>champlain_path_layer_set_fill_color, <a class="indexterm" href="ChamplainPathLayer.html#champlain-path-layer-set-fill-color">champlain_path_layer_set_fill_color ()</a>
diff -Nru libchamplain-0.12.0/docs/reference/html/libchamplain-ChamplainVersion.html libchamplain-0.12.1/docs/reference/html/libchamplain-ChamplainVersion.html
--- libchamplain-0.12.0/docs/reference/html/libchamplain-ChamplainVersion.html	2011-09-17 21:30:53.000000000 +0000
+++ libchamplain-0.12.1/docs/reference/html/libchamplain-ChamplainVersion.html	2011-12-20 01:11:42.000000000 +0000
@@ -77,7 +77,7 @@
 <hr>
 <div class="refsect2">
 <a name="CHAMPLAIN-MICRO-VERSION:CAPS"></a><h3>CHAMPLAIN_MICRO_VERSION</h3>
-<pre class="programlisting">#define CHAMPLAIN_MICRO_VERSION   (0)
+<pre class="programlisting">#define CHAMPLAIN_MICRO_VERSION   (1)
 </pre>
 <p>
 The micro version of libchamplain (3, if <a class="link" href="libchamplain-ChamplainVersion.html#CHAMPLAIN-VERSION:CAPS" title="CHAMPLAIN_VERSION"><code class="literal">CHAMPLAIN_VERSION</code></a> is 1.2.3)
@@ -86,7 +86,7 @@
 <hr>
 <div class="refsect2">
 <a name="CHAMPLAIN-VERSION:CAPS"></a><h3>CHAMPLAIN_VERSION</h3>
-<pre class="programlisting">#define CHAMPLAIN_VERSION         0.12.0
+<pre class="programlisting">#define CHAMPLAIN_VERSION         0.12.1
 </pre>
 <p>
 The full version of libchamplain, like 1.2.3
@@ -95,7 +95,7 @@
 <hr>
 <div class="refsect2">
 <a name="CHAMPLAIN-VERSION-S:CAPS"></a><h3>CHAMPLAIN_VERSION_S</h3>
-<pre class="programlisting">#define CHAMPLAIN_VERSION_S       "0.12.0"
+<pre class="programlisting">#define CHAMPLAIN_VERSION_S       "0.12.1"
 </pre>
 <p>
 The full version of libchamplain, in string form (suited for
diff -Nru libchamplain-0.12.0/docs/reference/html/libchamplain.devhelp2 libchamplain-0.12.1/docs/reference/html/libchamplain.devhelp2
--- libchamplain-0.12.0/docs/reference/html/libchamplain.devhelp2	2011-09-17 21:30:53.000000000 +0000
+++ libchamplain-0.12.1/docs/reference/html/libchamplain.devhelp2	2011-12-20 01:11:42.000000000 +0000
@@ -169,6 +169,8 @@
     <keyword type="function" name="champlain_path_layer_set_visible ()" link="ChamplainPathLayer.html#champlain-path-layer-set-visible" since="0.10"/>
     <keyword type="function" name="champlain_path_layer_get_closed ()" link="ChamplainPathLayer.html#champlain-path-layer-get-closed" since="0.10"/>
     <keyword type="function" name="champlain_path_layer_set_closed ()" link="ChamplainPathLayer.html#champlain-path-layer-set-closed" since="0.10"/>
+    <keyword type="function" name="champlain_path_layer_get_dash ()" link="ChamplainPathLayer.html#champlain-path-layer-get-dash" since="0.14"/>
+    <keyword type="function" name="champlain_path_layer_set_dash ()" link="ChamplainPathLayer.html#champlain-path-layer-set-dash" since="0.14"/>
     <keyword type="property" name="The &quot;closed&quot; property" link="ChamplainPathLayer.html#ChamplainPathLayer--closed"/>
     <keyword type="property" name="The &quot;fill&quot; property" link="ChamplainPathLayer.html#ChamplainPathLayer--fill"/>
     <keyword type="property" name="The &quot;fill-color&quot; property" link="ChamplainPathLayer.html#ChamplainPathLayer--fill-color"/>
diff -Nru libchamplain-0.12.0/docs/reference/libchamplain-sections.txt libchamplain-0.12.1/docs/reference/libchamplain-sections.txt
--- libchamplain-0.12.0/docs/reference/libchamplain-sections.txt	2011-09-17 21:30:53.000000000 +0000
+++ libchamplain-0.12.1/docs/reference/libchamplain-sections.txt	2011-12-20 01:11:42.000000000 +0000
@@ -750,6 +750,8 @@
 champlain_path_layer_set_visible
 champlain_path_layer_get_closed
 champlain_path_layer_set_closed
+champlain_path_layer_get_dash
+champlain_path_layer_set_dash
 <SUBSECTION Standard>
 CHAMPLAIN_PATH_LAYER
 CHAMPLAIN_IS_PATH_LAYER
diff -Nru libchamplain-0.12.0/docs/reference/Makefile.am libchamplain-0.12.1/docs/reference/Makefile.am
--- libchamplain-0.12.0/docs/reference/Makefile.am	2011-09-17 00:16:27.000000000 +0000
+++ libchamplain-0.12.1/docs/reference/Makefile.am	2011-12-19 22:34:29.000000000 +0000
@@ -20,7 +20,7 @@
 DOC_SOURCE_DIR=../../champlain
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=--type-init-func="g_type_init();g_thread_init(NULL)"
+SCANGOBJ_OPTIONS=--type-init-func="g_type_init()"
 
 # Extra options to supply to gtkdoc-scan.
 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
diff -Nru libchamplain-0.12.0/docs/reference/Makefile.in libchamplain-0.12.1/docs/reference/Makefile.in
--- libchamplain-0.12.0/docs/reference/Makefile.in	2011-09-17 21:29:18.000000000 +0000
+++ libchamplain-0.12.1/docs/reference/Makefile.in	2011-12-20 01:10:12.000000000 +0000
@@ -246,7 +246,7 @@
 DOC_SOURCE_DIR = ../../champlain
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS = --type-init-func="g_type_init();g_thread_init(NULL)"
+SCANGOBJ_OPTIONS = --type-init-func="g_type_init()"
 
 # Extra options to supply to gtkdoc-scan.
 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
diff -Nru libchamplain-0.12.0/docs/reference/tmpl/champlain-path-layer.sgml libchamplain-0.12.1/docs/reference/tmpl/champlain-path-layer.sgml
--- libchamplain-0.12.0/docs/reference/tmpl/champlain-path-layer.sgml	2011-09-17 21:30:53.000000000 +0000
+++ libchamplain-0.12.1/docs/reference/tmpl/champlain-path-layer.sgml	2011-12-20 01:11:42.000000000 +0000
@@ -241,3 +241,21 @@
 @value: 
 
 
+<!-- ##### FUNCTION champlain_path_layer_get_dash ##### -->
+<para>
+
+</para>
+
+@layer: 
+@Returns: 
+
+
+<!-- ##### FUNCTION champlain_path_layer_set_dash ##### -->
+<para>
+
+</para>
+
+@layer: 
+@dash_pattern: 
+
+
diff -Nru libchamplain-0.12.0/docs/reference/version.xml libchamplain-0.12.1/docs/reference/version.xml
--- libchamplain-0.12.0/docs/reference/version.xml	2011-09-17 21:29:24.000000000 +0000
+++ libchamplain-0.12.1/docs/reference/version.xml	2011-12-20 01:10:19.000000000 +0000
@@ -1 +1 @@
-0.12.0
+0.12.1
diff -Nru libchamplain-0.12.0/docs/reference-gtk/html/index.html libchamplain-0.12.1/docs/reference-gtk/html/index.html
--- libchamplain-0.12.0/docs/reference-gtk/html/index.html	2011-09-17 21:30:53.000000000 +0000
+++ libchamplain-0.12.1/docs/reference-gtk/html/index.html	2011-12-20 01:11:43.000000000 +0000
@@ -16,7 +16,7 @@
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libchamplain-gtk Reference Manual</p></th></tr></table></div>
 <div>
 <p class="releaseinfo">
-      for libchamplain-gtk 0.12.0
+      for libchamplain-gtk 0.12.1
 
       </p>
 <p>
diff -Nru libchamplain-0.12.0/docs/reference-gtk/Makefile.am libchamplain-0.12.1/docs/reference-gtk/Makefile.am
--- libchamplain-0.12.0/docs/reference-gtk/Makefile.am	2011-09-17 00:16:27.000000000 +0000
+++ libchamplain-0.12.1/docs/reference-gtk/Makefile.am	2011-12-19 22:34:29.000000000 +0000
@@ -20,7 +20,7 @@
 DOC_SOURCE_DIR=../../champlain-gtk
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=--type-init-func='g_type_init();g_thread_init(NULL)'
+SCANGOBJ_OPTIONS=--type-init-func='g_type_init()'
 
 # Extra options to supply to gtkdoc-scan.
 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
diff -Nru libchamplain-0.12.0/docs/reference-gtk/Makefile.in libchamplain-0.12.1/docs/reference-gtk/Makefile.in
--- libchamplain-0.12.0/docs/reference-gtk/Makefile.in	2011-09-17 21:29:18.000000000 +0000
+++ libchamplain-0.12.1/docs/reference-gtk/Makefile.in	2011-12-20 01:10:12.000000000 +0000
@@ -246,7 +246,7 @@
 DOC_SOURCE_DIR = ../../champlain-gtk
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS = --type-init-func='g_type_init();g_thread_init(NULL)'
+SCANGOBJ_OPTIONS = --type-init-func='g_type_init()'
 
 # Extra options to supply to gtkdoc-scan.
 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
diff -Nru libchamplain-0.12.0/docs/reference-gtk/version.xml libchamplain-0.12.1/docs/reference-gtk/version.xml
--- libchamplain-0.12.0/docs/reference-gtk/version.xml	2011-09-17 21:29:24.000000000 +0000
+++ libchamplain-0.12.1/docs/reference-gtk/version.xml	2011-12-20 01:10:19.000000000 +0000
@@ -1 +1 @@
-0.12.0
+0.12.1
diff -Nru libchamplain-0.12.0/NEWS libchamplain-0.12.1/NEWS
--- libchamplain-0.12.0/NEWS	2011-09-17 21:11:45.000000000 +0000
+++ libchamplain-0.12.1/NEWS	2011-12-20 01:06:21.000000000 +0000
@@ -1,3 +1,18 @@
+libchamplain 0.12.1 (2011-12-20)
+===============================
+
+Stable release
+
+Changes:
+* Fix scale drawing (Jiří Techet)
+* Don't call g_thread_init (Colin Walters)
+* Redraw path when its properties change (Jiří Techet)
+* Fix crashes on ChamplainView destruction (Jiří Techet)
+* Add dashed lines drawing to paths (Jiří Techet)
+* Fix factory methods for introspection-based bindings (Jiří Techet)
+* Fix wrong zoom actor placement at low zoom levels (Jiří Techet)
+* Minor fixes and improvements (Jiří Techet)
+
 libchamplain 0.12.0 (2011-09-17)
 ===============================