prepare 0.15.1

8 files changed, 66 insertions, 23 deletions

diff --git a/NEWS b/NEWS
index 8cda05c0..e7b515f1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,13 +1,37 @@
-telepathy-glib 0.15.1 (UNRELEASED)
+telepathy-glib 0.15.1 (2011-05-30)
 ==================================
 
+The "Bugzilla etiquette" release.
+
+This new release in the 0.15 development cycle contains all the fixes
+released in 0.14.7.
+
 Fixes:
 
 • tp_text_channel_set_chat_state_finish: check the right
   source tag. (Guillaume)
+
 • TpConnection: set the self handle to something sane instead of
   leaving uninitialized. (Jonny)
 
+• Fix a race in tp_channel_dispatch_operation_claim_with_async()
+  (fdo #37280 Guillaume)
+
+Enhancements:
+
+• TpTextChannel: high level API for SMS; the TP_TEXT_CHANNEL_FEATURE_SMS
+  feature is automatically prepared by TpAutomaticProxyFactory.
+  (fdo #37358 Guillaume)
+
+• TpConnection: high level API for Balance.
+  (fdo #36334 Emilio, Danielle, Guillaume)
+
+• tp_channel_dispatch_operation_close_channels_async: convenient API to
+  claim a ChannelDispatchOperation and close all its channels.
+  (fdo #28015 Guillaume)
+
+• TpBaseContactList: add ContactBlocking support (fdo #35331 Will)
+
 telepathy-glib 0.15.0 (2011-05-17)
 ==================================
 
diff --git a/configure.ac b/configure.ac
index 42297d37..919da044 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], [15])
-m4_define([tp_glib_micro_version], [0])
-m4_define([tp_glib_nano_version], [1])
+m4_define([tp_glib_micro_version], [1])
+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], [57])
+m4_define([tp_glib_lt_current], [58])
 m4_define([tp_glib_lt_revision], [0])
-m4_define([tp_glib_lt_age], [57])
+m4_define([tp_glib_lt_age], [58])
 
 # Some magic
 m4_define([tp_glib_base_version],
diff --git a/telepathy-glib/abi.am b/telepathy-glib/abi.am
index 9e922898..7ed44eb0 100644
--- a/telepathy-glib/abi.am
+++ b/telepathy-glib/abi.am
@@ -71,6 +71,7 @@ ABI_LISTS = \
     versions/0.14.4.abi \
     versions/0.14.5.abi \
     versions/0.15.0.abi \
+    versions/0.15.1.abi \
     $(NULL)
 
 # The quoting here is unnecessary but harmless, and has the useful side-effect
diff --git a/telepathy-glib/base-contact-list.c b/telepathy-glib/base-contact-list.c
index ce9fb2c8..ef618a8b 100644
--- a/telepathy-glib/base-contact-list.c
+++ b/telepathy-glib/base-contact-list.c
@@ -390,7 +390,7 @@ G_DEFINE_INTERFACE (TpMutableContactList, tp_mutable_contact_list,
  *  tp_base_contact_list_block_contacts_async(); either this or
  *  @block_contacts_async must always be provided. If the underlying protocol
  *  does not support reporting contacts as abusive, implement
- *  @block_contacts_async instead. Since: 0.15.UNRELEASED
+ *  @block_contacts_async instead. Since: 0.15.1
  *
  * The interface vtable for a %TP_TYPE_BLOCKABLE_CONTACT_LIST.
  *
@@ -3115,7 +3115,7 @@ tp_base_contact_list_get_request_uses_message (TpBaseContactList *self)
  * Signature of a virtual method that blocks a set of contacts, optionally
  * reporting them to the server operator as abusive.
  *
- * Since: 0.15.UNRELEASED
+ * Since: 0.15.1
  */
 
 /**
@@ -3258,7 +3258,7 @@ tp_base_contact_list_block_contacts_async (TpBaseContactList *self,
  * tp_base_contact_list_contact_blocking_changed()
  * for any contacts it has changed, before calling @callback.
  *
- * Since: 0.15.UNRELEASED
+ * Since: 0.15.1
  */
 void
 tp_base_contact_list_block_contacts_with_abuse_async (TpBaseContactList *self,
@@ -3338,7 +3338,7 @@ tp_base_contact_list_block_contacts_finish (TpBaseContactList *self,
  *
  * Returns: %TRUE on success or %FALSE on error
  *
- * Since: 0.15.UNRELEASED
+ * Since: 0.15.1
  */
 gboolean
 tp_base_contact_list_block_contacts_with_abuse_finish (TpBaseContactList *self,
@@ -5929,7 +5929,7 @@ tp_base_contact_list_mixin_unblock_contacts (
  * This function should be passed to G_IMPLEMENT_INTERFACE() for
  * #TpSvcConnectionInterfaceContactBlocking
  *
- * Since: 0.13.UNRELEASED
+ * Since: 0.15.1
  */
 void
 tp_base_contact_list_mixin_blocking_iface_init (
diff --git a/telepathy-glib/channel-dispatch-operation.c b/telepathy-glib/channel-dispatch-operation.c
index a3bbe129..d6afb429 100644
--- a/telepathy-glib/channel-dispatch-operation.c
+++ b/telepathy-glib/channel-dispatch-operation.c
@@ -1638,7 +1638,7 @@ claim_close_channels_cb (TpChannelDispatchOperation *self,
  * been completed. Again, see tp_channel_dispatch_operation_handle_with_async()
  * for more details.
  *
- * Since: 0.15.UNRELEASED
+ * Since: 0.15.1
  */
 void
 tp_channel_dispatch_operation_close_channels_async (
@@ -1666,7 +1666,7 @@ tp_channel_dispatch_operation_close_channels_async (
  * Returns: %TRUE if the Claim() call was successful and
  * Close() has at least been attempted on all the channels, otherwise %FALSE
  *
- * Since: 0.15.UNRELEASED
+ * Since: 0.15.1
  */
 gboolean
 tp_channel_dispatch_operation_close_channels_finish (
diff --git a/telepathy-glib/connection.c b/telepathy-glib/connection.c
index 2d3e6369..dddeab3e 100644
--- a/telepathy-glib/connection.c
+++ b/telepathy-glib/connection.c
@@ -189,7 +189,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: UNRELEASED
+ * Since: 0.15.1
  */
 
 GQuark
@@ -1747,7 +1747,7 @@ tp_connection_class_init (TpConnectionClass *klass)
    * For this signal to be emitted, you must first call
    * tp_proxy_prepare_async() with the feature %TP_CONNECTION_FEATURE_BALANCE.
    *
-   * Since: 0.15.UNRELEASED
+   * Since: 0.15.1
    */
   signals[SIGNAL_BALANCE_CHANGED] = g_signal_new ("balance-changed",
       G_OBJECT_CLASS_TYPE (klass),
@@ -2852,7 +2852,7 @@ tp_connection_bind_connection_status_to_property (TpConnection *self,
  *
  * Returns: %TRUE if the balance is valid (and the values set), %FALSE if the
  *   balance is invalid.
- * Since: UNRELEASED
+ * Since: 0.15.1
  */
 gboolean
 tp_connection_get_balance (TpConnection *self,
@@ -2891,7 +2891,7 @@ tp_connection_get_balance (TpConnection *self,
  * Requires %TP_CONNECTION_FEATURE_BALANCE to be prepared.
  *
  * Returns: (transfer none): the #TpConnection:balance-uri property.
- * Since: UNRELEASED
+ * Since: 0.15.1
  */
 const gchar *
 tp_connection_get_balance_uri (TpConnection *self)
diff --git a/telepathy-glib/text-channel.c b/telepathy-glib/text-channel.c
index 0b13d10d..78956f5f 100644
--- a/telepathy-glib/text-channel.c
+++ b/telepathy-glib/text-channel.c
@@ -1046,7 +1046,7 @@ tp_text_channel_class_init (TpTextChannelClass *klass)
    * This property is not guaranteed to have a meaningful value until
    * TP_TEXT_CHANNEL_FEATURE_SMS has been prepared.
    *
-   * Since: 0.15.UNRELEASED
+   * Since: 0.15.1
    */
   param_spec = g_param_spec_boolean ("is-sms-channel",
       "is SMS channel",
@@ -1064,7 +1064,7 @@ tp_text_channel_class_init (TpTextChannelClass *klass)
    * on this channel). If %FALSE, no incoming class 0 SMSes will appear
    * on this channel.
    *
-   * Since: 0.15.UNRELEASED
+   * Since: 0.15.1
    */
   param_spec = g_param_spec_boolean ("sms-flash",
       "SMS flash",
@@ -1692,7 +1692,7 @@ tp_text_channel_supports_message_type (TpTextChannel *self,
  * One can ask for a feature to be prepared using the
  * tp_proxy_prepare_async() function, and waiting for it to callback.
  *
- * Since: 0.15.UNRELEASED
+ * Since: 0.15.1
  */
 GQuark
 tp_text_channel_get_feature_quark_sms (void)
@@ -1708,7 +1708,7 @@ tp_text_channel_get_feature_quark_sms (void)
  *
  * Returns: the value of #TpTextChannel:is-sms-channel property
  *
- * Since: 0.15.UNRELEASED
+ * Since: 0.15.1
  */
 gboolean
 tp_text_channel_is_sms_channel (TpTextChannel *self)
@@ -1726,7 +1726,7 @@ tp_text_channel_is_sms_channel (TpTextChannel *self)
  *
  * Returns: the value of #TpTextChannel:sms-flash property
  *
- * Since: 0.15.UNRELEASED
+ * Since: 0.15.1
  */
 gboolean
 tp_text_channel_get_sms_flash (TpTextChannel *self)
@@ -1809,7 +1809,7 @@ out:
  * You can then call tp_text_channel_get_sms_length_finish() to get the
  * result of the operation.
  *
- * Since: 0.15.UNRELEASED
+ * Since: 0.15.1
  */
 void
 tp_text_channel_get_sms_length_async (TpTextChannel *self,
@@ -1853,7 +1853,7 @@ tp_text_channel_get_sms_length_async (TpTextChannel *self,
  * Returns: %TRUE if the number of 140 octet chunks required to send
  * the message has been retrieved, %FALSE otherwise.
  *
- * Since: 0.15.UNRELEASED
+ * Since: 0.15.1
  */
 gboolean
 tp_text_channel_get_sms_length_finish (TpTextChannel *self,
diff --git a/telepathy-glib/versions/0.15.1.abi b/telepathy-glib/versions/0.15.1.abi
new file mode 100644
index 00000000..4ac44bb9
--- /dev/null
+++ b/telepathy-glib/versions/0.15.1.abi
@@ -0,0 +1,18 @@
+Version: TELEPATHY_GLIB_0.15.1
+Extends: TELEPATHY_GLIB_0.15.0
+Release: 0.15.1
+
+tp_base_contact_list_block_contacts_with_abuse_async
+tp_base_contact_list_block_contacts_with_abuse_finish
+tp_base_contact_list_mixin_blocking_iface_init
+tp_channel_dispatch_operation_close_channels_async
+tp_channel_dispatch_operation_close_channels_finish
+tp_connection_get_balance
+tp_connection_get_balance_uri
+tp_connection_get_feature_quark_balance
+tp_handle_set_to_identifier_map
+tp_text_channel_get_feature_quark_sms
+tp_text_channel_get_sms_flash
+tp_text_channel_get_sms_length_async
+tp_text_channel_get_sms_length_finish
+tp_text_channel_is_sms_channel