Merge remote branch 'pierlux-clone/scale' into scale

diff --cc champlain/champlain-view.c
index e91be8654b3084b624638b300b565a383b7eaf9a,d77b3014ccde8a3621f48ce2e58bc674178163ad..8e1245ce1af1edf8798e609f295964b104ed82c7
--- 1/champlain/champlain-view.c
--- 2/champlain/champlain-view.c
+++ b/champlain/champlain-view.c
@@@ -923,8 -907,25 +938,24 @@@ champlain_view_class_init (ChamplainVie
             CHAMPLAIN_STATE_INIT,
             G_PARAM_READABLE));
  
+   /**
+   * ChamplainView:display-scale:
+   *
+   * Display the map scale.
+   *
+   * Since: 0.6
+   */
+   g_object_class_install_property (object_class,
+        PROP_DISPLAY_SCALE,
+        g_param_spec_boolean ("display-scale",
+            "Display the map scale",
+            "Display the map scale "
+            "on the screen",
+            TRUE,
+            G_PARAM_READWRITE));
+ 
    /**
    * ChamplainView::animation-completed:
 -  * @view: the #ChamplainView that received the signal
    *
    * The ::animation-completed signal is emitted when any animation in the view
    * ends.  This is a detailed signal.  For example, if you want to be signaled