0.21.0 releasetelepathy-glib-0.21.0

5 files changed, 16 insertions, 10 deletions

diff --git a/NEWS b/NEWS
index 11d303470..2c0555718 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-telepathy-glib 0.21.0 (UNRELEASED)
+telepathy-glib 0.21.0 (2013-04-03)
 ==================================
 
 This starts a new development branch.
@@ -30,6 +30,12 @@ Fixes:
 
 • Fix builds with Automake 1.13 (fd.o #59604, Nuno Araujo)
 
+• Fix unit tests when running with glib >=2.36 (fd.o #63069, Xavier)
+
+• Fix refcycle preventing TpConnection objects to be freed. This theoretically
+  introduce a behaviour change of tp_connection_get_self_contact() that now
+  returns NULL when the connection as been invalidated. (fd.o #63027, Xavier)
+
 Deprecations:
 
 • tp_g_key_file_get_int64, tp_g_key_file_get_uint64 (use the corresponding
diff --git a/configure.ac b/configure.ac
index 275c4109f..134ac37c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,9 +10,9 @@ AC_PREREQ([2.59])
 #   set nano_version to 1
 
 m4_define([tp_glib_major_version], [0])
-m4_define([tp_glib_minor_version], [20])
-m4_define([tp_glib_micro_version], [999])
-m4_define([tp_glib_nano_version], [1])
+m4_define([tp_glib_minor_version], [21])
+m4_define([tp_glib_micro_version], [0])
+m4_define([tp_glib_nano_version], [0])
 
 # If library source has changed since last release, increment revision
 # If interfaces have been added, removed or changed since last release,
@@ -27,7 +27,7 @@ m4_define([tp_glib_nano_version], [1])
 # never seen in a release).
 
 m4_define([tp_glib_lt_current], [78])
-m4_define([tp_glib_lt_revision], [1])
+m4_define([tp_glib_lt_revision], [2])
 m4_define([tp_glib_lt_age], [78])
 
 # Some magic
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index 511b94313..18114e05f 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -2089,7 +2089,7 @@ tp_account_class_init (TpAccountClass *klass)
    * The notify::uri-schemes signal cannot be relied on if the Account Manager
    * is Mission Control version 5.14.0 or older.
    *
-   * Since: UNRELEASED
+   * Since: 0.21.0
    */
   g_object_class_install_property (object_class, PROP_URI_SCHEMES,
       g_param_spec_boxed ("uri-schemes",
diff --git a/telepathy-glib/util.c b/telepathy-glib/util.c
index c8b1aa216..91a42d5a0 100644
--- a/telepathy-glib/util.c
+++ b/telepathy-glib/util.c
@@ -829,7 +829,7 @@ tp_strv_contains (const gchar * const *strv,
  * 0 if the key was not found or could not be parsed.
  *
  * Since: 0.7.31
- * Deprecated: Since 0.UNRELEASED. Use g_key_file_get_int64() instead.
+ * Deprecated: Since 0.21.0. Use g_key_file_get_int64() instead.
  */
 gint64
 tp_g_key_file_get_int64 (GKeyFile *key_file,
@@ -878,7 +878,7 @@ tp_g_key_file_get_int64 (GKeyFile *key_file,
  * or 0 if the key was not found or could not be parsed.
  *
  * Since: 0.7.31
- * Deprecated: Since 0.UNRELEASED. Use g_key_file_get_uint64() instead.
+ * Deprecated: Since 0.21.0. Use g_key_file_get_uint64() instead.
  */
 guint64
 tp_g_key_file_get_uint64 (GKeyFile *key_file,
diff --git a/telepathy-glib/util.h b/telepathy-glib/util.h
index cbbfce8c6..5c5b9a036 100644
--- a/telepathy-glib/util.h
+++ b/telepathy-glib/util.h
@@ -96,10 +96,10 @@ gchar *tp_escape_as_identifier (const gchar *name) G_GNUC_WARN_UNUSED_RESULT;
 gboolean tp_strv_contains (const gchar * const *strv, const gchar *str);
 
 #ifndef TP_DISABLE_DEPRECATED
-_TP_DEPRECATED_IN_UNRELEASED_FOR(g_key_file_get_int64)
+_TP_DEPRECATED_IN_0_22_FOR(g_key_file_get_int64)
 gint64 tp_g_key_file_get_int64 (GKeyFile *key_file, const gchar *group_name,
     const gchar *key, GError **error);
-_TP_DEPRECATED_IN_UNRELEASED_FOR(g_key_file_get_uint64)
+_TP_DEPRECATED_IN_0_22_FOR(g_key_file_get_uint64)
 guint64 tp_g_key_file_get_uint64 (GKeyFile *key_file, const gchar *group_name,
     const gchar *key, GError **error);
 #endif