From: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date: Wed, 19 Nov 2008 16:25:49 +0000 (-0500)
Subject: Merge branch 'master' of git@gitorious.org:libchamplain/mainline.git
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a21449fe91988168916ab1da069c3f59dbfab23c;p=libchamplain

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

Conflicts:

	demos/launcher.c
---

a21449fe91988168916ab1da069c3f59dbfab23c
diff --cc champlain/champlainview.c
index 8253419,d076eda..5409827
--- a/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;