Prepare version 0.11.4telepathy-glib-0.11.4

6 files changed, 34 insertions, 17 deletions

diff --git a/NEWS b/NEWS
index 019d1ad34..3fea24501 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
-telepathy-glib 0.11.4 (UNRELEASED)
+telepathy-glib 0.11.4 (2010-04-28)
 ==================================
 
+The “not sure whether to be amused or terrified” release.
+
 This version includes all the bugfixes from today's 0.10.5 release.
 
 Requirements:
@@ -24,6 +26,9 @@ Enhancements:
   that it's always non-NULL, even before the channel is ready (previously,
   it could be NULL before the channel was ready)
 
+∮ fd.o #23369 (partial): improve error mapping on TpConnection and
+  TpBaseConnection, and add tp_connection_get_detailed_error (smcv)
+
 Fixes:
 
 ∮ fd.o #27780: when TpAccount:connection changes, emit notify::connection (smcv)
diff --git a/configure.ac b/configure.ac
index 3ef0ed978..98cd160e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,8 +11,8 @@ AC_PREREQ([2.59])
 
 m4_define([tp_glib_major_version], [0])
 m4_define([tp_glib_minor_version], [11])
-m4_define([tp_glib_micro_version], [3])
-m4_define([tp_glib_nano_version], [1])
+m4_define([tp_glib_micro_version], [4])
+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,
@@ -26,9 +26,9 @@ m4_define([tp_glib_nano_version], [1])
 # (we don't guarantee that we won't add ABI then remove it again, if it was
 # never seen in a release).
 
-m4_define([tp_glib_lt_current], [35])
-m4_define([tp_glib_lt_revision], [1])
-m4_define([tp_glib_lt_age], [35])
+m4_define([tp_glib_lt_current], [36])
+m4_define([tp_glib_lt_revision], [0])
+m4_define([tp_glib_lt_age], [36])
 
 # Some magic
 m4_define([tp_glib_base_version],
diff --git a/telepathy-glib/abi.am b/telepathy-glib/abi.am
index c3c7eaa8c..971179e29 100644
--- a/telepathy-glib/abi.am
+++ b/telepathy-glib/abi.am
@@ -38,7 +38,8 @@ ABI_LISTS = \
     versions/0.9.2.abi \
     versions/0.11.0.abi \
     versions/0.11.1.abi \
-    versions/0.11.3.abi
+    versions/0.11.3.abi \
+    versions/0.11.4.abi
 
 # The quoting here is unnecessary but harmless, and has the useful side-effect
 # that vim quickfix mode (:make) doesn't interpret the libtool --mode=link
diff --git a/telepathy-glib/channel.c b/telepathy-glib/channel.c
index 87486782b..0e372e5f1 100644
--- a/telepathy-glib/channel.c
+++ b/telepathy-glib/channel.c
@@ -296,7 +296,7 @@ tp_channel_get_handle (TpChannel *self,
  * This is the same as the #TpChannel:identifier property, and isn't guaranteed
  * to be set until the %TP_CHANNEL_FEATURE_CORE property is ready.
  *
- * Changed in 0.11.UNRELEASED: as with #TpChannel:identifier, this could
+ * Changed in 0.11.4: as with #TpChannel:identifier, this could
  * previously either be %NULL or the empty string if there was no suitable
  * value. It is now non-%NULL in all cases.
  *
@@ -1466,7 +1466,7 @@ tp_channel_class_init (TpChannelClass *klass)
    * finished preparing %TP_CHANNEL_FEATURE_CORE; until then, it may be
    * the empty string.
    *
-   * Changed in 0.11.UNRELEASED: this property is never %NULL. Previously,
+   * Changed in 0.11.4: this property is never %NULL. Previously,
    * it was %NULL before an identifier was known, or when a channel
    * with no TargetID D-Bus property had TargetHandleType %TP_HANDLE_TYPE_NONE.
    */
diff --git a/telepathy-glib/connection.c b/telepathy-glib/connection.c
index 5ab3ad259..9a83c3302 100644
--- a/telepathy-glib/connection.c
+++ b/telepathy-glib/connection.c
@@ -183,7 +183,7 @@ tp_connection_get_feature_quark_capabilities (void)
  * One can ask for a feature to be prepared using the
  * tp_proxy_prepare_async() function, and waiting for it to callback.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.4
  */
 
 GQuark
@@ -2055,7 +2055,7 @@ tp_connection_get_capabilities (TpConnection *self)
  * Returns: (transfer none): a #TpAvatarRequirements struct, or %NULL if the
  *  feature is not yet prepared or the connection doesn't have the necessary
  *  properties.
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.4
  */
 TpAvatarRequirements *
 tp_connection_get_avatar_requirements (TpConnection *self)
@@ -2084,7 +2084,7 @@ tp_connection_get_avatar_requirements (TpConnection *self)
  *
  * The requirements for setting an avatar on a particular protocol.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.4
  */
 
 /**
@@ -2092,7 +2092,7 @@ tp_connection_get_avatar_requirements (TpConnection *self)
  *
  * The boxed type of a #TpAvatarRequirements.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.4
  */
 GType
 tp_avatar_requirements_get_type (void)
@@ -2130,7 +2130,7 @@ tp_avatar_requirements_get_type (void)
  *
  * Returns: a newly allocated #TpAvatarRequirements, free it with
  * tp_avatar_requirements_destroy()
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.4
  */
 TpAvatarRequirements *
 tp_avatar_requirements_new (GStrv supported_mime_types,
@@ -2165,7 +2165,7 @@ tp_avatar_requirements_new (GStrv supported_mime_types,
  *
  * Returns: a newly allocated #TpAvatarRequirements, free it with
  * tp_avatar_requirements_destroy()
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.4
  */
 TpAvatarRequirements *
 tp_avatar_requirements_copy (TpAvatarRequirements *self)
@@ -2188,7 +2188,7 @@ tp_avatar_requirements_copy (TpAvatarRequirements *self)
  *
  * Free all memory used by the #TpAvatarRequirements.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.4
  */
 void
 tp_avatar_requirements_destroy (TpAvatarRequirements *self)
@@ -2214,7 +2214,7 @@ tp_avatar_requirements_destroy (TpAvatarRequirements *self)
  *
  * Returns: (transfer none) (allow-none): a D-Bus error name, or %NULL.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.4
  */
 const gchar *
 tp_connection_get_detailed_error (TpConnection *self,
diff --git a/telepathy-glib/versions/0.11.4.abi b/telepathy-glib/versions/0.11.4.abi
new file mode 100644
index 000000000..d15604b99
--- /dev/null
+++ b/telepathy-glib/versions/0.11.4.abi
@@ -0,0 +1,11 @@
+Version: TELEPATHY_GLIB_0.11.4
+Extends: TELEPATHY_GLIB_0.11.3
+Release: 0.11.4
+
+tp_avatar_requirements_copy
+tp_avatar_requirements_destroy
+tp_avatar_requirements_get_type
+tp_avatar_requirements_new
+tp_connection_get_avatar_requirements
+tp_connection_get_detailed_error
+tp_connection_get_feature_quark_avatar_requirements