0.12.9LIBCHAMPLAIN_0_12_9

3 files changed, 30 insertions, 14 deletions

diff --git a/NEWS b/NEWS
index b5395a3..3131d48 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+libchamplain 0.12.9 (2014-09-18)
+================================
+
+Stable release
+
+Changes:
+
+* For privacy reasons use https instead of http in map sources 
+  that support it (Jiří Techet)
+* Fixed leaked idle function in ChamplainPathLayer and ChamplainScale 
+  (Damián Nohales, Jiří Techet)
+* Don't deselect all markers when a marker got deselected (Damián Nohales)
+* Various minor fixes and compilation warning removal (Jiří Techet)
+
 libchamplain 0.12.8 (2014-07-01)
 ================================
 
diff --git a/champlain/champlain-0.12.vapi b/champlain/champlain-0.12.vapi
index 62ca646..6050632 100644
--- a/champlain/champlain-0.12.vapi
+++ b/champlain/champlain-0.12.vapi
@@ -111,14 +111,14 @@ namespace Champlain {
 		public Label.full (string text, Clutter.Actor actor);
 		public Pango.Alignment get_alignment ();
 		public Pango.AttrList get_attributes ();
-		public Clutter.Color get_color ();
+		public Clutter.Color? get_color ();
 		public bool get_draw_background ();
 		public Pango.EllipsizeMode get_ellipsize ();
 		public unowned string get_font_name ();
 		public unowned Clutter.Actor get_image ();
 		public bool get_single_line_mode ();
 		public unowned string get_text ();
-		public Clutter.Color get_text_color ();
+		public Clutter.Color? get_text_color ();
 		public bool get_use_markup ();
 		public bool get_wrap ();
 		public Pango.WrapMode get_wrap_mode ();
@@ -255,8 +255,8 @@ namespace Champlain {
 		public bool get_draggable ();
 		public bool get_selectable ();
 		public bool get_selected ();
-		public static Clutter.Color get_selection_color ();
-		public static Clutter.Color get_selection_text_color ();
+		public static unowned Clutter.Color? get_selection_color ();
+		public static unowned Clutter.Color? get_selection_text_color ();
 		public void set_draggable (bool value);
 		public void set_selectable (bool value);
 		public void set_selected (bool value);
@@ -265,10 +265,10 @@ namespace Champlain {
 		public bool draggable { get; set; }
 		public bool selectable { get; set; }
 		public bool selected { get; set; }
-		public signal void button_press (Clutter.Event object);
-		public signal void button_release (Clutter.Event object);
-		public signal void drag_finish (Clutter.Event object);
-		public signal void drag_motion (double object, double p0, Clutter.Event p1);
+		public signal void button_press (Clutter.Event event);
+		public signal void button_release (Clutter.Event event);
+		public signal void drag_finish (Clutter.Event event);
+		public signal void drag_motion (double dx, double dy, Clutter.Event event);
 	}
 	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_marker_layer_get_type ()")]
 	public class MarkerLayer : Champlain.Layer, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
@@ -347,10 +347,10 @@ namespace Champlain {
 		public bool get_closed ();
 		public GLib.List<weak uint> get_dash ();
 		public bool get_fill ();
-		public Clutter.Color get_fill_color ();
+		public Clutter.Color? get_fill_color ();
 		public GLib.List<weak Champlain.Location> get_nodes ();
 		public bool get_stroke ();
-		public Clutter.Color get_stroke_color ();
+		public Clutter.Color? get_stroke_color ();
 		public double get_stroke_width ();
 		public bool get_visible ();
 		public void insert_node (Champlain.Location location, uint position);
@@ -378,7 +378,7 @@ namespace Champlain {
 		public Point ();
 		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Point.full (double size, Clutter.Color color);
-		public Clutter.Color get_color ();
+		public Clutter.Color? get_color ();
 		public double get_size ();
 		public void set_color (Clutter.Color? color);
 		public void set_size (double size);
@@ -414,7 +414,7 @@ namespace Champlain {
 		public unowned Clutter.Actor get_content ();
 		public unowned string get_etag ();
 		public bool get_fade_in ();
-		public GLib.TimeVal get_modified_time ();
+		public unowned GLib.TimeVal? get_modified_time ();
 		public uint get_size ();
 		public Champlain.State get_state ();
 		public uint get_x ();
@@ -611,6 +611,7 @@ namespace Champlain {
 	[CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAP_SOURCE_MFF_RELIEF")]
 	public const string MAP_SOURCE_MFF_RELIEF;
 	[CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAP_SOURCE_OAM")]
+	[Deprecated]
 	public const string MAP_SOURCE_OAM;
 	[CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAP_SOURCE_OSM_AERIAL_MAP")]
 	public const string MAP_SOURCE_OSM_AERIAL_MAP;
@@ -621,6 +622,7 @@ namespace Champlain {
 	[CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAP_SOURCE_OSM_MAPQUEST")]
 	public const string MAP_SOURCE_OSM_MAPQUEST;
 	[CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAP_SOURCE_OSM_OSMARENDER")]
+	[Deprecated]
 	public const string MAP_SOURCE_OSM_OSMARENDER;
 	[CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAP_SOURCE_OSM_TRANSPORT_MAP")]
 	public const string MAP_SOURCE_OSM_TRANSPORT_MAP;
diff --git a/configure.ac b/configure.ac
index 492e093..d810324 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 m4_define([champlain_major_version], [0])
 m4_define([champlain_minor_version], [12])
-m4_define([champlain_micro_version], [8])
+m4_define([champlain_micro_version], [9])
 m4_define([champlain_version],
           [champlain_major_version.champlain_minor_version.champlain_micro_version])
 m4_define([champlain_minor_api_version], [m4_eval(champlain_minor_version + champlain_minor_version%2)])
@@ -36,7 +36,7 @@ AM_PROG_CC_C_O
 # - If binary compatibility has been broken (eg removed or changed interfaces)
 #   change to C+1:0:0
 # - If the interface is the same as the previous version, change to C:R+1:A
-LIBRARY_VERSION=4:3:4
+LIBRARY_VERSION=4:4:4
 CHAMPLAIN_API_VERSION=champlain_api_version
 CHAMPLAIN_API_VERSION_NORM=champlain_major_version[_]champlain_minor_api_version
 CHAMPLAIN_MAJOR_VERSION=champlain_major_version