Merge branch 'master' of git@gitorious.org:libchamplain/mainline.git

Conflicts:

	demos/launcher.c

diff --cc champlain/champlainview.c
index 8253419df960c244dfae4d04b6572a3fefa9efd6,d076edaf5d31b9ea764eec6a16ece09b4b51e4d5..54098279dbe6beb604f7227e97eaad2920a998f8
--- 1/champlain/champlainview.c
--- 2/champlain/champlainview.c
+++ b/champlain/champlainview.c
@@@ -763,15 -816,13 +816,13 @@@ champlain_view_center_on (ChamplainVie
  
    ChamplainViewPrivate *priv = CHAMPLAIN_VIEW_GET_PRIVATE (view);
  
+   priv->longitude = longitude;
+   priv->latitude = latitude;
+ 
    if(!priv->map)
-     {
-       // keep until the viewport is created
-       priv->longitude = longitude;
-       priv->latitude = latitude;
-       return;
-     }
+     return;
  
 -  gdouble x, y;
 +  gint x, y;
    x = priv->map->longitude_to_x(priv->map, longitude, priv->map->current_level->level);
    y = priv->map->latitude_to_y(priv->map, latitude, priv->map->current_level->level);
    ChamplainPoint* anchor = &priv->map->current_level->anchor;