[libchamplain: 10/10] Merge branch 'LIBCHAMPLAIN_0_4_5'

[Jiří Techet <jiritechet src gnome org>]

commit 6ffab22ec0dfbc975b2441f6e5869ebb7a91ea77
Merge: 3494c40 54f92ec
Author: JiÅ?í Techet <techet gmail com>
Date:   Mon May 10 23:29:29 2010 +0200

    Merge branch 'LIBCHAMPLAIN_0_4_5'
    
    Conflicts:
    	AUTHORS
    	NEWS
    	configure.ac

 AUTHORS                    |    1 +
 NEWS                       |   12 ++++++++++++
 champlain/champlain-view.c |   15 +++++++--------
 3 files changed, 20 insertions(+), 8 deletions(-)
---
diff --cc AUTHORS
index 5a56f4b,20a8519..afeecce
--- a/AUTHORS
+++ b/AUTHORS
@@@ -31,5 -30,4 +31,6 @@@ Koop Mast <kwm freebsd org
  Laurent Bigonville <bigon debian org>
  Tollef Fog Heen <tfheen err no>
  Andreas Henriksson <andreas fatal se>
 +JiÅ?í Techet <techet gmail com>
 +Götz Waschk <waschk mandriva org>
+ Rob Bradford <rob linux intel com>
diff --cc NEWS
index 75e1bb0,19a7f7c..c4c26f2
--- a/NEWS
+++ b/NEWS
@@@ -1,29 -1,15 +1,41 @@@
 +libchamplain 0.5.1 (2010-01-25)
 +===============================
 +
 +Unstable release
 +Bindings have not been updated yet.
 +The API is not settled yet.
 +
 +Fixes:
 +* Disable Python and Instrospection until libMemphis gets bindings
 +  (Pierre-Luc Beaudoin)
 +* Add missing files in tarball (Pierre-Luc Beaudoin)
 +* Remove generated headers from build (Götz Waschk)
 +
 +libchamplain 0.5.0 (2010-01-24)
 +===============================
 +
 +Unstable release
 +Bindings have not been updated yet.
 +The API is not settled yet.
 +
 +Additions:
 +* Add local rendering of OpenStreetMap data (Simon Wenner, Google Summer of
 +  Code 2009)
 +* New map source infrastructure (à  la Pipe and Filter) (JiÅ?í Techet)
 +* ChamplainPolygon and ChamplainMapSource inherit from GInitiallyUnowned
 +
+ libchamplain 0.4.5 (2010-03-10)
+ ===============================
+ 
+ Stable release
+ GObject-introspection, Python (Victor Godoy Poluceno) and Perl
+ (Emmanuel Rodriguez) bindings are in a working state.
+ 
+ Fixes:
+ * Fix missing lat/lon property notifications (Jonathon Jongsma)
+ * Remove the need to explicitly set the size of actors (Rob Bradford)
+ * Properly get rid of marker's previous image (Pierre-Luc Beaudoin)
+ 
  libchamplain 0.4.4 (2010-01-28)
  ===============================
  
diff --cc champlain/champlain-view.c
index 4977356,e9c6d17..2256acb
--- a/champlain/champlain-view.c
+++ b/champlain/champlain-view.c
@@@ -344,20 -315,18 +346,17 @@@ update_viewport (ChamplainView *view
    priv->viewport_size.y = y;
  
    view_load_visible_tiles (view);
 -  view_tiles_reposition (view);
    marker_reposition (view);
    update_scale (view);
- 
    view_update_polygons (view);
-   lon = viewport_get_current_longitude (priv);
-   lat = viewport_get_current_latitude (priv);
  
-   priv->longitude = lon;
-   priv->latitude = lat;
+   priv->longitude = viewport_get_current_longitude (priv);
+   priv->latitude = viewport_get_current_latitude (priv);
  
-   if (fabs (priv->longitude - lon) > 0.001)
+   if (fabs (priv->longitude - old_lon) > 0.001)
      g_object_notify (G_OBJECT (view), "longitude");
  
-   if (fabs (priv->latitude - lat) > 0.001)
+   if (fabs (priv->latitude - old_lat) > 0.001)
      g_object_notify (G_OBJECT (view), "latitude");
  }