From: Tollef Fog Heen <tfheen@err.no>
Date: Mon, 9 Nov 2009 21:27:05 +0000 (+0100)
Subject: Merge remote branch 'pierlux-clone/scale' into scale
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64030217cf54e72b5af0696bfddef30a90ed02f5;p=libchamplain

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

64030217cf54e72b5af0696bfddef30a90ed02f5
diff --cc champlain/champlain-view.c
index e91be86,d77b301..8e1245c
--- a/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