0.99.6telepathy-glib-0.99.6

8 files changed, 51 insertions, 18 deletions

diff --git a/NEWS b/NEWS
index db010f41e..a057242c2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,41 @@
-telepathy-glib 0.99.6 (UNRELEASED)
+telepathy-glib 0.99.6 (2014-01-13)
 ==================================
 
-...
+The “little by little” release.
+
+API breaks:
+
+• Spec 0.99.6
+  · merge Conn.I.Contacts into Connection
+  · do not include Conn.I.Requests in Connection.Interfaces
+
+• Better parallel-installability (fd.o #49737, Simon):
+  · rename Logger's GIR to TelepathyLogger-1
+  · explicitly ask for TelepathyGLib-1 in examples
+
+• TpContactsMixin no longer exists: instead, TpBaseConnection has a
+  fill_contacts_attribute() virtual method (fd.o #50093, Simon)
+
+• Replace TpPresenceMixinClass.get_contact_statuses (multiple contacts)
+  with a simpler TpPresenceMixinClass.get_contact_status (one contact)
+  (fd.o #50093, Simon)
+
+• TpBaseConnection has more ABI padding (fd.o #50093, Simon)
+
+• New mandatory method TpBlockableContactListInterface.is_blocked
+  (fd.o #50093, Simon)
+
+Other changes:
+
+• Include telepathy-farstream in telepathy-glib source releases
+  (fd.o #73409, Simon)
+
+• Enable GLib 2.36 deprecation warnings (fd.o #71048, Simon)
+
+• TpFileTransferChannel: fix possible crashes (fd.o #72319, Xavier)
+
+• Improve debug output for tp_list_connection_managers (fd.o #68390;
+  Simon, Guillaume)
 
 telepathy-glib 0.99.5 (2013-11-11)
 ==================================
diff --git a/configure.ac b/configure.ac
index 83579f0a8..1018cfb09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,8 +15,8 @@ AC_COPYRIGHT([
 
 m4_define([tp_glib_major_version], [0])
 m4_define([tp_glib_minor_version], [99])
-m4_define([tp_glib_micro_version], [5])
-m4_define([tp_glib_nano_version], [1])
+m4_define([tp_glib_micro_version], [6])
+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,
diff --git a/docs/reference/telepathy-glib/telepathy-glib-docs.sgml b/docs/reference/telepathy-glib/telepathy-glib-docs.sgml
index e1f492e06..d4f75fdae 100644
--- a/docs/reference/telepathy-glib/telepathy-glib-docs.sgml
+++ b/docs/reference/telepathy-glib/telepathy-glib-docs.sgml
@@ -150,7 +150,6 @@
     <xi:include href="xml/connection-avatars.xml"/>
     <xi:include href="xml/connection-balance.xml"/>
     <xi:include href="xml/connection-client-types.xml"/>
-    <xi:include href="xml/connection-contacts.xml"/>
     <xi:include href="xml/connection-contact-info.xml"/>
     <xi:include href="xml/connection-contact-list.xml"/>
     <xi:include href="xml/connection-caps.xml"/>
diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c
index 97a720ec6..4b3ee05c3 100644
--- a/telepathy-glib/base-connection.c
+++ b/telepathy-glib/base-connection.c
@@ -181,7 +181,7 @@
  *  by using tp_contact_attribute_map_set()
  *  or tp_contact_attribute_map_take_sliced_gvalue, and return. Otherwise,
  *  chain up to the superclass' implementation.
- *  Since: 0.UNRELEASED
+ *  Since: 0.99.6
  *
  * The class of a #TpBaseConnection. Many members are virtual methods etc.
  * to be filled in in the subclass' class_init function.
@@ -1116,7 +1116,7 @@ tp_base_connection_get_interfaces_always_present (TpBaseConnection *self)
  * tp_contact_attribute_map_take_sliced_gvalue, and return. Otherwise,
  * chain up to the superclass' implementation.
  *
- * Since: 0.UNRELEASED
+ * Since: 0.99.6
  */
 
 static void
@@ -2966,7 +2966,7 @@ tp_base_connection_get_object_path (TpBaseConnection *self)
  * This structure cannot currently be copied, freed or read via
  * public API.
  *
- * Since: 0.UNRELEASED
+ * Since: 0.99.6
  */
 
 /* Implementation detail: there is no such thing as a TpContactAttributeMap,
@@ -2983,7 +2983,7 @@ tp_base_connection_get_object_path (TpBaseConnection *self)
  * Put a contact attribute in @self. It is an error to use this function
  * for a @contact that was not requested.
  *
- * Since: 0.UNRELEASED
+ * Since: 0.99.6
  */
 void
 tp_contact_attribute_map_set (TpContactAttributeMap *map,
@@ -3014,7 +3014,7 @@ tp_contact_attribute_map_set (TpContactAttributeMap *map,
  * introspectable, but is close to the API that "Telepathy 0"
  * connection managers used.
  *
- * Since: 0.UNRELEASED
+ * Since: 0.99.6
  */
 void
 tp_contact_attribute_map_take_sliced_gvalue (TpContactAttributeMap *map,
@@ -3069,7 +3069,7 @@ static const gchar * const contacts_always_included_interfaces[] = {
  *
  * Returns: (element-type guint GLib.HashTable): a map from #TpHandle
  *  to #GHashTable, where the values are maps from string to #GValue
- * Since: 0.UNRELEASED
+ * Since: 0.99.6
  */
 GHashTable *
 tp_base_connection_dup_contact_attributes_hash (TpBaseConnection *self,
diff --git a/telepathy-glib/base-connection.h b/telepathy-glib/base-connection.h
index 9e53d5bc2..bf7cd82a0 100644
--- a/telepathy-glib/base-connection.h
+++ b/telepathy-glib/base-connection.h
@@ -216,20 +216,20 @@ void tp_base_connection_add_client_interest (TpBaseConnection *self,
 void tp_base_connection_add_possible_client_interest (TpBaseConnection *self,
     GQuark token);
 
-_TP_AVAILABLE_IN_UNRELEASED
+_TP_AVAILABLE_IN_1_0
 GHashTable *tp_base_connection_dup_contact_attributes_hash (
     TpBaseConnection *self,
     const GArray *handles,
     const gchar * const *interfaces,
     const gchar * const *assumed_interfaces);
 
-_TP_AVAILABLE_IN_UNRELEASED
+_TP_AVAILABLE_IN_1_0
 void tp_contact_attribute_map_set (TpContactAttributeMap *map,
     TpHandle contact,
     const gchar *token,
     GVariant *value);
 
-_TP_AVAILABLE_IN_UNRELEASED
+_TP_AVAILABLE_IN_1_0
 void tp_contact_attribute_map_take_sliced_gvalue (TpContactAttributeMap *map,
     TpHandle contact,
     const gchar *token,
diff --git a/telepathy-glib/base-contact-list.c b/telepathy-glib/base-contact-list.c
index 509c02c23..ecca0dcbe 100644
--- a/telepathy-glib/base-contact-list.c
+++ b/telepathy-glib/base-contact-list.c
@@ -2167,7 +2167,7 @@ tp_base_contact_list_can_block (TpBaseContactList *self)
  *
  * Returns: %TRUE if @contact would be in
  *  tp_base_contact_list_dup_blocked_contacts()
- * Since: 0.UNRELEASED
+ * Since: 0.99.6
  */
 gboolean
 tp_base_contact_list_is_blocked (TpBaseContactList *self,
diff --git a/telepathy-glib/base-contact-list.h b/telepathy-glib/base-contact-list.h
index e610895a0..db61fdb3d 100644
--- a/telepathy-glib/base-contact-list.h
+++ b/telepathy-glib/base-contact-list.h
@@ -299,7 +299,7 @@ void tp_base_contact_list_contact_blocking_changed (
 
 gboolean tp_base_contact_list_can_block (TpBaseContactList *self);
 
-_TP_AVAILABLE_IN_UNRELEASED
+_TP_AVAILABLE_IN_1_0
 gboolean tp_base_contact_list_is_blocked (TpBaseContactList *self,
     TpHandle contact);
 TpHandleSet *tp_base_contact_list_dup_blocked_contacts (
@@ -596,7 +596,7 @@ void tp_base_contact_list_mixin_groups_iface_init (gpointer klass);
 _TP_AVAILABLE_IN_0_16
 void tp_base_contact_list_mixin_blocking_iface_init (gpointer klass);
 
-_TP_AVAILABLE_IN_UNRELEASED
+_TP_AVAILABLE_IN_1_0
 gboolean tp_base_contact_list_fill_contact_attributes (TpBaseContactList *self,
   const gchar *dbus_interface,
   TpHandle contact,
diff --git a/telepathy-glib/presence-mixin.h b/telepathy-glib/presence-mixin.h
index ea9b4b9f1..649c03271 100644
--- a/telepathy-glib/presence-mixin.h
+++ b/telepathy-glib/presence-mixin.h
@@ -180,7 +180,7 @@ void tp_presence_mixin_emit_one_presence_update (GObject *obj,
 void tp_presence_mixin_iface_init (gpointer g_iface, gpointer iface_data);
 void tp_presence_mixin_init_dbus_properties (GObjectClass *cls);
 
-_TP_AVAILABLE_IN_UNRELEASED
+_TP_AVAILABLE_IN_1_0
 gboolean tp_presence_mixin_fill_contact_attributes (GObject *obj,
   const gchar *dbus_interface,
   TpHandle contact,