Prepare release 0.11.5telepathy-glib-0.11.5

17 files changed, 153 insertions, 94 deletions

diff --git a/NEWS b/NEWS
index ac7ed8c4c..c2351c348 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
-telepathy-glib 0.11.5 (UNRELEASED)
+telepathy-glib 0.11.5 (2010-05-10)
 ==================================
 
+The "also, hi from bl.uk" release.
+
 API changes:
 
 ⌬ fd.o #23369: when the local user is removed from a Group Channel, the
@@ -16,13 +18,16 @@ API changes:
 
 Enhancements:
 
-⌬ fd.o #25236: TpBaseClient, a base class for Observers, which will also
-  support Approvers and Handlers in a future release (cassidy)
+⌬ fd.o #25236: TpBaseClient, a base class for Observers and Approvers, which
+  will also support Handlers in a future release (cassidy)
 
-⌬ fd.o #27871: TpSimpleObserver, a simple TpBaseClient subclass for
-  projects that don't need their own subclass (cassidy)
+⌬ fd.o #27871, #24214: TpSimpleObserver, a simple TpBaseClient subclass for
+  projects that don't need their own subclass, and an example Observer that
+  uses it (cassidy)
 
-⌬ fd.o #24214: telepathy-glib now implements an example Observer (cassidy)
+⌬ fd.o #27875: TpSimpleApprover, a simple TpBaseClient subclass for
+  projects that don't need their own subclass, and an example Approver that
+  uses it (cassidy)
 
 ⌬ fd.o #27899: internal macros for ERROR(), CRITICAL() etc., analogous to
   DEBUG() (jonny)
@@ -30,6 +35,12 @@ Enhancements:
 ⌬ fd.o #23369: improve the errors with which a Group TpChannel is invalidated
   if we're removed, as per "API changes" above (smcv)
 
+⌬ fd.o #18055: generate GEnum types for TpCMInfoSource, TpContactFeature,
+  TpDBusError, and GFlags types for TpDBusNameType and
+  TpDBusPropertiesMixinFlags. Note that TpConnectionManager:info-source is
+  still of type G_TYPE_UINT, not TP_TYPE_CM_INFO_SOURCE, since switching it
+  would be an ABI break. (danni, smcv)
+
 Fixes:
 
 ⌬ fd.o #26211: correct the generated constants for contact attributes and
@@ -38,6 +49,10 @@ Fixes:
 ⌬ fd.o #24689: document more clearly that the TpConnectionManager.protocols
   struct member can be reallocated (smcv)
 
+⌬ fd.o #28043: explicitly link tests/* against dbus-glib, fixing compilation
+  with GNU gold, with GNU ld with LDFLAGS=-Wl,--no-add-needed, and hopefully
+  also with Fedora 13's patched GNU ld (see Red Hat #564245) (smcv)
+
 ⌬ some fixes to GObject-Introspection metadata (danni)
 
 telepathy-glib 0.11.4 (2010-04-28)
diff --git a/configure.ac b/configure.ac
index 9ea5d5dcb..fcf7315e2 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], [4])
-m4_define([tp_glib_nano_version], [1])
+m4_define([tp_glib_micro_version], [5])
+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], [36])
+m4_define([tp_glib_lt_current], [37])
 m4_define([tp_glib_lt_revision], [0])
-m4_define([tp_glib_lt_age], [36])
+m4_define([tp_glib_lt_age], [37])
 
 # Some magic
 m4_define([tp_glib_base_version],
diff --git a/telepathy-glib/abi.am b/telepathy-glib/abi.am
index 971179e29..9ea83342c 100644
--- a/telepathy-glib/abi.am
+++ b/telepathy-glib/abi.am
@@ -39,7 +39,8 @@ ABI_LISTS = \
     versions/0.11.0.abi \
     versions/0.11.1.abi \
     versions/0.11.3.abi \
-    versions/0.11.4.abi
+    versions/0.11.4.abi \
+    versions/0.11.5.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/add-dispatch-operation-context.c b/telepathy-glib/add-dispatch-operation-context.c
index 1b19ac2f1..f10e04dcf 100644
--- a/telepathy-glib/add-dispatch-operation-context.c
+++ b/telepathy-glib/add-dispatch-operation-context.c
@@ -33,7 +33,7 @@
  * Data structure representing the context of a Approver.AddDispatchOperation()
  * call.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 
 /**
@@ -41,7 +41,7 @@
  *
  * The class of a #TpAddDispatchOperationContext.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 
 #include "telepathy-glib/add-dispatch-operation-context-internal.h"
@@ -261,7 +261,7 @@ tp_add_dispatch_operation_context_class_init (
    *
    * This property can't be %NULL.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
   param_spec = g_param_spec_object ("account", "TpAccount",
       "The TpAccount of the context",
@@ -279,7 +279,7 @@ tp_add_dispatch_operation_context_class_init (
    *
    * This property can't be %NULL.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
   param_spec = g_param_spec_object ("connection", "TpConnection",
       "The TpConnection of the context",
@@ -297,7 +297,7 @@ tp_add_dispatch_operation_context_class_init (
    *
    * This property can't be %NULL.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
   param_spec = g_param_spec_boxed ("channels", "GPtrArray of TpChannel",
       "The TpChannels that have been passed to AddDispatchOperation",
@@ -315,7 +315,7 @@ tp_add_dispatch_operation_context_class_init (
    *
    * This property can't be %NULL.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
   param_spec = g_param_spec_object ("dispatch-operation",
      "TpChannelDispatchOperation",
@@ -333,7 +333,7 @@ tp_add_dispatch_operation_context_class_init (
    * AddDispatchOperation call.
    * Can only be written during construction.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
   param_spec = g_param_spec_pointer ("dbus-context", "D-Bus context",
       "The DBusGMethodInvocation associated with the AddDispatchOperation call",
@@ -366,7 +366,7 @@ _tp_add_dispatch_operation_context_new (
  * Called by #TpBaseClientClassAddDispatchOperationImpl when it's done so
  * the D-Bus method can return.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 void
 tp_add_dispatch_operation_context_accept (TpAddDispatchOperationContext *self)
@@ -389,7 +389,7 @@ tp_add_dispatch_operation_context_accept (TpAddDispatchOperationContext *self)
  *
  * Called by #TpBaseClientClassAddDispatchOperationImpl to raise a D-Bus error.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 void
 tp_add_dispatch_operation_context_fail (TpAddDispatchOperationContext *self,
@@ -417,7 +417,7 @@ tp_add_dispatch_operation_context_fail (TpAddDispatchOperationContext *self,
  * tp_add_dispatch_operation_context_accept() or
  * tp_add_dispatch_operation_context_fail() later.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 void
 tp_add_dispatch_operation_context_delay (TpAddDispatchOperationContext *self)
diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c
index 0e317047f..5f05ae863 100644
--- a/telepathy-glib/base-client.c
+++ b/telepathy-glib/base-client.c
@@ -36,7 +36,7 @@
  *
  * Data structure representing a generic #TpSvcClient implementation.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 
 /**
@@ -44,7 +44,7 @@
  *
  * The class of a #TpBaseClient.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 
 /**
@@ -69,7 +69,7 @@
  * tp_observe_channels_context_delay() or tp_observe_channels_context_fail()
  * on @context before it returns.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 
 /**
@@ -96,7 +96,7 @@
  * channels, or tp_channel_dispatch_operation_claim_async() to take
  * responsibility for handling or closing them".
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 
 #include "telepathy-glib/base-client.h"
@@ -200,7 +200,7 @@ _tp_base_client_copy_filter (GHashTable *filter)
  * called, and may only be called on objects whose class has called
  * tp_base_client_implement_observe_channels().
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 void
 tp_base_client_add_observer_filter (TpBaseClient *self,
@@ -230,7 +230,7 @@ tp_base_client_add_observer_filter (TpBaseClient *self,
  *        ...));
  * ]|
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 void
 tp_base_client_take_observer_filter (TpBaseClient *self,
@@ -268,7 +268,7 @@ tp_base_client_take_observer_filter (TpBaseClient *self,
  * called, and may only be called on objects whose class has called
  * tp_base_client_implement_observe_channels().
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 void
 tp_base_client_set_observer_recover (TpBaseClient *self,
@@ -298,7 +298,7 @@ tp_base_client_set_observer_recover (TpBaseClient *self,
  * called, and may only be called on objects whose class has called
  * tp_base_client_implement_add_dispatch_operation().
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 void
 tp_base_client_add_approver_filter (TpBaseClient *self,
@@ -328,7 +328,7 @@ tp_base_client_add_approver_filter (TpBaseClient *self,
  *        ...));
  * ]|
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 void
 tp_base_client_take_approver_filter (TpBaseClient *self,
@@ -359,7 +359,7 @@ tp_base_client_take_approver_filter (TpBaseClient *self,
  *
  * Returns: %TRUE if the client was registered successfully
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 gboolean
 tp_base_client_register (TpBaseClient *self,
@@ -664,7 +664,7 @@ tp_base_client_class_init (TpBaseClientClass *cls)
    *
    * This property can't be %NULL.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
   param_spec = g_param_spec_object ("dbus-daemon", "TpDBusDaemon object",
       "The dbus daemon associated with this client",
@@ -680,7 +680,7 @@ tp_base_client_class_init (TpBaseClientClass *cls)
    *
    * This property can't be %NULL.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
  param_spec = g_param_spec_string ("name", "name",
       "The name of the client",
@@ -694,7 +694,7 @@ tp_base_client_class_init (TpBaseClientClass *cls)
    * If %TRUE, tp_base_client_register() will append an unique token to the
    * service bus name and object path to ensure they are unique.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
  param_spec = g_param_spec_boolean ("uniquify-name", "Uniquify name",
       "if TRUE, append a unique token to the name",
@@ -1102,7 +1102,7 @@ approver_iface_init (gpointer g_iface,
  * Called by subclasses to define the actual implementation of the
  * ObserveChannels() D-Bus method.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 void
 tp_base_client_implement_observe_channels (TpBaseClientClass *cls,
@@ -1121,7 +1121,7 @@ tp_base_client_implement_observe_channels (TpBaseClientClass *cls,
  *
  * Returns: the bus name of the client
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 const gchar *
 tp_base_client_get_bus_name (TpBaseClient *self)
@@ -1139,7 +1139,7 @@ tp_base_client_get_bus_name (TpBaseClient *self)
  *
  * Returns: the object path of the client
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 const gchar *
 tp_base_client_get_object_path (TpBaseClient *self)
@@ -1156,7 +1156,7 @@ tp_base_client_get_object_path (TpBaseClient *self)
  * Called by subclasses to define the actual implementation of the
  * AddDispatchOperation() D-Bus method.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 void
 tp_base_client_implement_add_dispatch_operation (TpBaseClientClass *cls,
diff --git a/telepathy-glib/channel-dispatch-operation.c b/telepathy-glib/channel-dispatch-operation.c
index 68942e166..1d171511c 100644
--- a/telepathy-glib/channel-dispatch-operation.c
+++ b/telepathy-glib/channel-dispatch-operation.c
@@ -762,7 +762,7 @@ tp_channel_dispatch_operation_class_init (TpChannelDispatchOperationClass *klass
    * This is not guaranteed to be set until tp_proxy_prepare_async() has
    * finished preparing %TP_CHANNEL_DISPATCH_OPERATION_FEATURE_CORE.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
   param_spec = g_param_spec_object ("connection", "TpConnection",
       "The TpConnection of this channel dispatch operation",
@@ -781,7 +781,7 @@ tp_channel_dispatch_operation_class_init (TpChannelDispatchOperationClass *klass
    * This is not guaranteed to be set until tp_proxy_prepare_async() has
    * finished preparing %TP_CHANNEL_DISPATCH_OPERATION_FEATURE_CORE.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
   param_spec = g_param_spec_object ("account", "TpAccount",
       "The TpAccount of this channel dispatch operation",
@@ -800,7 +800,7 @@ tp_channel_dispatch_operation_class_init (TpChannelDispatchOperationClass *klass
    * This is not guaranteed to be set until tp_proxy_prepare_async() has
    * finished preparing %TP_CHANNEL_DISPATCH_OPERATION_FEATURE_CORE.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
   param_spec = g_param_spec_boxed ("channels", "GPtrArray of TpChannel",
       "The TpChannel to be dispatched",
@@ -821,7 +821,7 @@ tp_channel_dispatch_operation_class_init (TpChannelDispatchOperationClass *klass
    * This is not guaranteed to be set until tp_proxy_prepare_async() has
    * finished preparing %TP_CHANNEL_DISPATCH_OPERATION_FEATURE_CORE.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
   param_spec = g_param_spec_boxed ("possible-handlers", "Possible handlers",
       "Possible handlers for the channels",
@@ -842,7 +842,7 @@ tp_channel_dispatch_operation_class_init (TpChannelDispatchOperationClass *klass
    * tp_proxy_prepare_async() has finished preparing
    * %TP_CHANNEL_DISPATCH_OPERATION_FEATURE_CORE.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
   param_spec = g_param_spec_boxed ("cdo-properties",
       "Immutable D-Bus properties",
@@ -862,7 +862,7 @@ tp_channel_dispatch_operation_class_init (TpChannelDispatchOperationClass *klass
    *
    * Emitted when a channel has closed before it could be claimed or handled.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
   signals[SIGNAL_CHANNEL_LOST] = g_signal_new (
       "channel-lost", G_OBJECT_CLASS_TYPE (klass),
@@ -985,7 +985,7 @@ tp_channel_dispatch_operation_new (TpDBusDaemon *bus_daemon,
  * 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.5
  */
 GQuark
 tp_channel_dispatch_operation_get_feature_quark_core (void)
@@ -1004,7 +1004,7 @@ tp_channel_dispatch_operation_get_feature_quark_core (void)
  *
  * Returns: (transfer none): the value of #TpChannelDispatchOperation:connection
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 TpConnection *
 tp_channel_dispatch_operation_borrow_connection (
@@ -1023,7 +1023,7 @@ tp_channel_dispatch_operation_borrow_connection (
  *
  * Returns: (transfer none): the value of #TpChannelDispatchOperation:account
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 TpAccount *
 tp_channel_dispatch_operation_borrow_account (
@@ -1043,7 +1043,7 @@ tp_channel_dispatch_operation_borrow_account (
  *
  * Returns: (transfer none): the value of #TpChannelDispatchOperation:channels
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 GPtrArray *
 tp_channel_dispatch_operation_borrow_channels (
@@ -1064,7 +1064,7 @@ tp_channel_dispatch_operation_borrow_channels (
  * Returns: (transfer none): the value of
  * #TpChannelDispatchOperation:possible-handlers
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 GStrv
 tp_channel_dispatch_operation_borrow_possible_handlers (
@@ -1084,7 +1084,7 @@ tp_channel_dispatch_operation_borrow_possible_handlers (
  * Returns: (transfer none) (element-type utf8 GObject.Value): the value of
  * #TpChannelDispatchOperation:cdo-properties
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 GHashTable *
 tp_channel_dispatch_operation_borrow_immutable_properties (
@@ -1138,7 +1138,7 @@ handle_with_cb (TpChannelDispatchOperation *self,
  * of tp_channel_dispatch_operation_handle_with_async() to request
  * that they can handle a channel bundle themselves.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 void
 tp_channel_dispatch_operation_handle_with_async (
@@ -1169,7 +1169,7 @@ tp_channel_dispatch_operation_handle_with_async (
  *
  * Returns: %TRUE if the HandleWith() call was successful, otherwise %FALSE
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 gboolean
 tp_channel_dispatch_operation_handle_with_finish (
@@ -1230,7 +1230,7 @@ claim_cb (TpChannelDispatchOperation *self,
  * for more details. The approver MUST NOT attempt to interact with
  * the channels further in this case.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 void
 tp_channel_dispatch_operation_claim_async (
@@ -1259,7 +1259,7 @@ tp_channel_dispatch_operation_claim_async (
  *
  * Returns: %TRUE if the Claim() call was successful, otherwise %FALSE
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 gboolean
 tp_channel_dispatch_operation_claim_finish (
diff --git a/telepathy-glib/connection-manager.c b/telepathy-glib/connection-manager.c
index b661835d0..7928030c5 100644
--- a/telepathy-glib/connection-manager.c
+++ b/telepathy-glib/connection-manager.c
@@ -109,7 +109,7 @@ tp_connection_manager_get_feature_quark_core (void)
  * Describes possible sources of information on connection managers'
  * supported protocols.
  *
- * Since 0.11.UNRELEASED, there is a corresponding #GEnumClass type,
+ * Since 0.11.5, there is a corresponding #GEnumClass type,
  * %TP_TYPE_CM_INFO_SOURCE.
  *
  * Since: 0.7.1
@@ -120,7 +120,7 @@ tp_connection_manager_get_feature_quark_core (void)
  *
  * The #GEnumClass type of a #TpCMInfoSource.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 
 /**
diff --git a/telepathy-glib/contact.c b/telepathy-glib/contact.c
index 95106d724..a523fe25d 100644
--- a/telepathy-glib/contact.c
+++ b/telepathy-glib/contact.c
@@ -98,7 +98,7 @@ struct _TpContact {
  * the #TpContact code will only initialize state for those features, to
  * avoid unwanted D-Bus round-trips and signal connections.
  *
- * Since 0.11.UNRELEASED, there is a corresponding #GEnumClass type,
+ * Since 0.11.5, there is a corresponding #GEnumClass type,
  * %TP_TYPE_CONTACT_FEATURE.
  *
  * Since: 0.7.18
@@ -109,7 +109,7 @@ struct _TpContact {
  *
  * The #GEnumClass type of a #TpContactFeature.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 
 G_DEFINE_TYPE (TpContact, tp_contact, G_TYPE_OBJECT);
diff --git a/telepathy-glib/dbus-properties-mixin.c b/telepathy-glib/dbus-properties-mixin.c
index 1adf8919c..e884f9b5a 100644
--- a/telepathy-glib/dbus-properties-mixin.c
+++ b/telepathy-glib/dbus-properties-mixin.c
@@ -67,7 +67,7 @@
  *
  * Bitfield representing allowed access to a property.
  *
- * Since 0.11.UNRELEASED, there is a corresponding #GFlagsClass type,
+ * Since 0.11.5, there is a corresponding #GFlagsClass type,
  * %TP_TYPE_DBUS_PROPERTIES_MIXIN_FLAGS.
  *
  * Since: 0.7.3
@@ -78,7 +78,7 @@
  *
  * The #GFlagsClass type of #TpDBusPropertiesMixinFlags.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 
 /**
diff --git a/telepathy-glib/dbus.c b/telepathy-glib/dbus.c
index b119aea47..2cf092ba7 100644
--- a/telepathy-glib/dbus.c
+++ b/telepathy-glib/dbus.c
@@ -196,7 +196,7 @@ tp_get_bus_proxy (void)
  * types. %TP_DBUS_NAME_TYPE_NOT_BUS_DAEMON and %TP_DBUS_NAME_TYPE_ANY are
  * the bitwise-or of other appropriate types, for convenience.
  *
- * Since 0.11.UNRELEASED, there is a corresponding #GFlagsClass type,
+ * Since 0.11.5, there is a corresponding #GFlagsClass type,
  * %TP_TYPE_DBUS_NAME_TYPE.
  *
  * Since: 0.7.1
@@ -207,7 +207,7 @@ tp_get_bus_proxy (void)
  *
  * The #GFlagsClass type of a #TpDBusNameType or a set of name types.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 
 /**
diff --git a/telepathy-glib/extra-gtkdoc.h b/telepathy-glib/extra-gtkdoc.h
index 91969f2fb..f13e55de7 100644
--- a/telepathy-glib/extra-gtkdoc.h
+++ b/telepathy-glib/extra-gtkdoc.h
@@ -381,7 +381,7 @@
  * constants representing fully-qualified D-Bus property names, like
  * <literal>org.freedesktop.Telepathy.Channel.Interface.Group.GroupFlags</literal>.
  *
- * Since 0.11.UNRELEASED it also provides cpp defines like
+ * Since 0.11.5 it also provides cpp defines like
  * %TP_TOKEN_CONNECTION_INTERFACE_ALIASING_ALIAS for contact attributes like
  * "org.freedesktop.Telepathy.Connection.Interface.Aliasing/alias",
  * and defines like
diff --git a/telepathy-glib/observe-channels-context.c b/telepathy-glib/observe-channels-context.c
index 82ed58879..f9fb0e6e7 100644
--- a/telepathy-glib/observe-channels-context.c
+++ b/telepathy-glib/observe-channels-context.c
@@ -33,7 +33,7 @@
  * Data structure representing the context of a Observer.ObserveChannels()
  * call.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 
 /**
@@ -41,7 +41,7 @@
  *
  * The class of a #TpObserveChannelsContext.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 
 #include "telepathy-glib/observe-channels-context-internal.h"
@@ -276,7 +276,7 @@ tp_observe_channels_context_class_init (TpObserveChannelsContextClass *cls)
    *
    * This property can't be %NULL.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
   param_spec = g_param_spec_object ("account", "TpAccount",
       "The TpAccount that has been passed to ObserveChannels",
@@ -294,7 +294,7 @@ tp_observe_channels_context_class_init (TpObserveChannelsContextClass *cls)
    *
    * This property can't be %NULL.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
   param_spec = g_param_spec_object ("connection", "TpConnection",
       "The TpConnection that has been passed to ObserveChannels",
@@ -312,7 +312,7 @@ tp_observe_channels_context_class_init (TpObserveChannelsContextClass *cls)
    *
    * This property can't be %NULL.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
   param_spec = g_param_spec_boxed ("channels", "GPtrArray of TpChannel",
       "The TpChannels that have been passed to ObserveChannels",
@@ -329,7 +329,7 @@ tp_observe_channels_context_class_init (TpObserveChannelsContextClass *cls)
    * or %NULL if none has been passed.
    * Read-only except during construction.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
   param_spec = g_param_spec_object ("dispatch-operation",
      "TpChannelDispatchOperation",
@@ -348,7 +348,7 @@ tp_observe_channels_context_class_init (TpObserveChannelsContextClass *cls)
    *
    * This property can't be %NULL.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
   param_spec = g_param_spec_boxed ("requests", "GPtrArray of TpChannelRequest",
       "The TpChannelRequest that have been passed to ObserveChannels",
@@ -364,7 +364,7 @@ tp_observe_channels_context_class_init (TpObserveChannelsContextClass *cls)
    * ObserveChannels call.
    * Can only be written during construction.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
   param_spec = g_param_spec_pointer ("dbus-context", "D-Bus context",
       "The DBusGMethodInvocation associated with the ObserveChannels call",
@@ -383,7 +383,7 @@ tp_observe_channels_context_class_init (TpObserveChannelsContextClass *cls)
    *
    * This property can't be %NULL.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
   param_spec = g_param_spec_boxed ("observer-info", "Observer info",
       "The Observer_Info that has been passed to ObserveChannels",
@@ -421,7 +421,7 @@ _tp_observe_channels_context_new (
  * Called by #TpBaseClientClassObserveChannelsImpl when it's done so the D-Bus
  * method can return.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 void
 tp_observe_channels_context_accept (TpObserveChannelsContext *self)
@@ -443,7 +443,7 @@ tp_observe_channels_context_accept (TpObserveChannelsContext *self)
  *
  * Called by #TpBaseClientClassObserveChannelsImpl to raise a D-Bus error.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 void
 tp_observe_channels_context_fail (TpObserveChannelsContext *self,
@@ -469,7 +469,7 @@ tp_observe_channels_context_fail (TpObserveChannelsContext *self,
  * is responsible for calling either tp_observe_channels_context_accept() or
  * tp_observe_channels_context_fail() later.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 void
 tp_observe_channels_context_delay (TpObserveChannelsContext *self)
@@ -492,7 +492,7 @@ tp_observe_channels_context_delay (TpObserveChannelsContext *self)
  *
  * Returns: %TRUE for pre-existing channels, %FALSE for new channels
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 gboolean
 tp_observe_channels_context_is_recovering (TpObserveChannelsContext *self)
diff --git a/telepathy-glib/proxy.c b/telepathy-glib/proxy.c
index 9b9a30e5b..c4f742333 100644
--- a/telepathy-glib/proxy.c
+++ b/telepathy-glib/proxy.c
@@ -96,7 +96,7 @@ tp_dbus_errors_quark (void)
  *
  * #GError codes for use with the %TP_DBUS_ERRORS domain.
  *
- * Since 0.11.UNRELEASED, there is a corresponding #GEnumClass type,
+ * Since 0.11.5, there is a corresponding #GEnumClass type,
  * %TP_TYPE_DBUS_ERROR.
  *
  * Since: 0.7.1
@@ -107,7 +107,7 @@ tp_dbus_errors_quark (void)
  *
  * The #GEnumClass type of a #TpDBusError.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 
 /**
diff --git a/telepathy-glib/simple-approver.c b/telepathy-glib/simple-approver.c
index d476a0a8a..fcff8cbf7 100644
--- a/telepathy-glib/simple-approver.c
+++ b/telepathy-glib/simple-approver.c
@@ -61,7 +61,7 @@
  *
  * Data structure representing a simple Approver implementation.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 
 /**
@@ -69,7 +69,7 @@
  *
  * The class of a #TpSimpleApprover.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 
 /**
@@ -92,7 +92,7 @@
  * tp_add_dispatch_operation_context_delay() or
  * tp_add_dispatch_operation_context_fail() on @context before it returns.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 
 #include "telepathy-glib/simple-approver.h"
@@ -217,7 +217,7 @@ tp_simple_approver_class_init (TpSimpleApproverClass *cls)
    *
    * This property can't be %NULL.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
   param_spec = g_param_spec_pointer ("callback",
       "Callback",
@@ -232,7 +232,7 @@ tp_simple_approver_class_init (TpSimpleApproverClass *cls)
    * The user-data pointer passed to the callback implementing the
    * ApproverChannels D-Bus method.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
   param_spec = g_param_spec_pointer ("user-data", "user data",
       "pointer passed as user-data when ApproverChannels is called",
@@ -246,7 +246,7 @@ tp_simple_approver_class_init (TpSimpleApproverClass *cls)
    * The #GDestroyNotify function called to free the user-data pointer when
    * the #TpSimpleApprover is destroyed.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
   param_spec = g_param_spec_pointer ("destroy", "destroy",
       "function called to destroy the user-data when destroying the approver",
@@ -272,7 +272,7 @@ tp_simple_approver_class_init (TpSimpleApproverClass *cls)
  *
  * Returns: (type TelepathyGLib.SimpleApprover): a new #TpSimpleApprover
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 TpBaseClient *
 tp_simple_approver_new (TpDBusDaemon *dbus,
diff --git a/telepathy-glib/simple-observer.c b/telepathy-glib/simple-observer.c
index d9361165f..cb37093bc 100644
--- a/telepathy-glib/simple-observer.c
+++ b/telepathy-glib/simple-observer.c
@@ -63,7 +63,7 @@
  *
  * Data structure representing a simple Observer implementation.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 
 /**
@@ -71,7 +71,7 @@
  *
  * The class of a #TpSimpleObserver.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 
 /**
@@ -97,7 +97,7 @@
  * tp_observe_channels_context_delay() or tp_observe_channels_context_fail()
  * on @context before it returns.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 
 #include "telepathy-glib/simple-observer.h"
@@ -226,7 +226,7 @@ tp_simple_observer_class_init (TpSimpleObserverClass *cls)
    *
    * The value of the Observer.Recover D-Bus property.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
   param_spec = g_param_spec_boolean ("recover", "Recover",
       "Observer.Recover",
@@ -243,7 +243,7 @@ tp_simple_observer_class_init (TpSimpleObserverClass *cls)
    *
    * This property can't be %NULL.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
   param_spec = g_param_spec_pointer ("callback",
       "Callback",
@@ -258,7 +258,7 @@ tp_simple_observer_class_init (TpSimpleObserverClass *cls)
    * The user-data pointer passed to the callback implementing the
    * ObserverChannels D-Bus method.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
   param_spec = g_param_spec_pointer ("user-data", "user data",
       "pointer passed as user-data when ObserverChannels is called",
@@ -272,7 +272,7 @@ tp_simple_observer_class_init (TpSimpleObserverClass *cls)
    * The #GDestroyNotify function called to free the user-data pointer when
    * the #TpSimpleObserver is destroyed.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.5
    */
   param_spec = g_param_spec_pointer ("destroy", "destroy",
       "function called to destroy the user-data when destroying the observer",
@@ -298,7 +298,7 @@ tp_simple_observer_class_init (TpSimpleObserverClass *cls)
  *
  * Returns: (type TelepathyGLib.SimpleObserver): a new #TpSimpleObserver
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.5
  */
 TpBaseClient *
 tp_simple_observer_new (TpDBusDaemon *dbus,
diff --git a/telepathy-glib/versions/0.11.5.abi b/telepathy-glib/versions/0.11.5.abi
new file mode 100644
index 000000000..8be36e4bc
--- /dev/null
+++ b/telepathy-glib/versions/0.11.5.abi
@@ -0,0 +1,43 @@
+Version: TELEPATHY_GLIB_0.11.5
+Extends: TELEPATHY_GLIB_0.11.4
+Release: 0.11.5
+
+tp_add_dispatch_operation_context_accept
+tp_add_dispatch_operation_context_delay
+tp_add_dispatch_operation_context_fail
+tp_add_dispatch_operation_context_get_type
+tp_base_client_add_approver_filter
+tp_base_client_add_observer_filter
+tp_base_client_get_bus_name
+tp_base_client_get_object_path
+tp_base_client_get_type
+tp_base_client_implement_add_dispatch_operation
+tp_base_client_implement_observe_channels
+tp_base_client_register
+tp_base_client_set_observer_recover
+tp_base_client_take_approver_filter
+tp_base_client_take_observer_filter
+tp_channel_dispatch_operation_borrow_account
+tp_channel_dispatch_operation_borrow_channels
+tp_channel_dispatch_operation_borrow_connection
+tp_channel_dispatch_operation_borrow_immutable_properties
+tp_channel_dispatch_operation_borrow_possible_handlers
+tp_channel_dispatch_operation_claim_async
+tp_channel_dispatch_operation_claim_finish
+tp_channel_dispatch_operation_get_feature_quark_core
+tp_channel_dispatch_operation_handle_with_async
+tp_channel_dispatch_operation_handle_with_finish
+tp_cm_info_source_get_type
+tp_contact_feature_get_type
+tp_dbus_error_get_type
+tp_dbus_name_type_get_type
+tp_dbus_properties_mixin_flags_get_type
+tp_observe_channels_context_accept
+tp_observe_channels_context_delay
+tp_observe_channels_context_fail
+tp_observe_channels_context_get_type
+tp_observe_channels_context_is_recovering
+tp_simple_approver_get_type
+tp_simple_approver_new
+tp_simple_observer_get_type
+tp_simple_observer_new
diff --git a/tests/dbus/cli-group.c b/tests/dbus/cli-group.c
index 29e240c68..2d95465be 100644
--- a/tests/dbus/cli-group.c
+++ b/tests/dbus/cli-group.c
@@ -316,7 +316,7 @@ check_invalidated_unknown_error_cb (TpProxy *proxy,
   *invalidated = TRUE;
 
   /* Because we didn't understand the D-Bus error string, the Telepathy error
-   * is derived from the Channel_Group_Change_Reason; since 0.11.UNRELEASED
+   * is derived from the Channel_Group_Change_Reason; since 0.11.5
    * it's remapped into the TP_ERRORS domain if possible */
   g_assert_error (error, TP_ERRORS, TP_ERROR_NO_ANSWER);
   MYASSERT (strstr (message, REMOVED_UNKNOWN_ERROR) != NULL, " (%s, %s)",