summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac8
-rw-r--r--telepathy-glib/abi.am1
-rw-r--r--telepathy-glib/account-manager.c4
-rw-r--r--telepathy-glib/account.c4
-rw-r--r--telepathy-glib/channel-contacts.c16
-rw-r--r--telepathy-glib/channel.c10
-rw-r--r--telepathy-glib/dbus-properties-mixin.c4
-rw-r--r--telepathy-glib/dbus-tube-channel.c14
-rw-r--r--telepathy-glib/errors.c6
-rw-r--r--telepathy-glib/protocol.c4
-rw-r--r--telepathy-glib/versions/0.15.6.abi23
11 files changed, 59 insertions, 35 deletions
diff --git a/configure.ac b/configure.ac
index b4ffd975a..f287f7929 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], [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,
@@ -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], [61])
+m4_define([tp_glib_lt_current], [62])
m4_define([tp_glib_lt_revision], [0])
-m4_define([tp_glib_lt_age], [61])
+m4_define([tp_glib_lt_age], [62])
# Some magic
m4_define([tp_glib_base_version],
diff --git a/telepathy-glib/abi.am b/telepathy-glib/abi.am
index d28508bd0..7f98023b1 100644
--- a/telepathy-glib/abi.am
+++ b/telepathy-glib/abi.am
@@ -75,6 +75,7 @@ ABI_LISTS = \
versions/0.15.2.abi \
versions/0.15.3.abi \
versions/0.15.5.abi \
+ versions/0.15.6.abi \
$(NULL)
# The quoting here is unnecessary but harmless, and has the useful side-effect
diff --git a/telepathy-glib/account-manager.c b/telepathy-glib/account-manager.c
index d790d7c65..107caf171 100644
--- a/telepathy-glib/account-manager.c
+++ b/telepathy-glib/account-manager.c
@@ -1340,7 +1340,7 @@ tp_account_manager_is_prepared (TpAccountManager *manager,
* tp_proxy_prepare_async() with the same arguments.
*
* Since: 0.9.0
- * Deprecated: since 0.UNRELEASED, use tp_proxy_prepare_async() instead.
+ * Deprecated: since 0.15.6, use tp_proxy_prepare_async() instead.
*/
void
tp_account_manager_prepare_async (TpAccountManager *manager,
@@ -1362,7 +1362,7 @@ tp_account_manager_prepare_async (TpAccountManager *manager,
* Returns: %TRUE if the preparation was successful, otherwise %FALSE
*
* Since: 0.9.0
- * Deprecated: since 0.UNRELEASED, use tp_proxy_prepare_finish() instead.
+ * Deprecated: since 0.15.6, use tp_proxy_prepare_finish() instead.
*/
gboolean
tp_account_manager_prepare_finish (TpAccountManager *manager,
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index f8566f10f..689876b7d 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -3413,7 +3413,7 @@ tp_account_is_prepared (TpAccount *account,
* tp_proxy_prepare_async() with the same arguments.
*
* Since: 0.9.0
- * Deprecated: since 0.UNRELEASED, use tp_proxy_prepare_async() instead.
+ * Deprecated: since 0.15.6, use tp_proxy_prepare_async() instead.
*/
void
tp_account_prepare_async (TpAccount *account,
@@ -3435,7 +3435,7 @@ tp_account_prepare_async (TpAccount *account,
* Returns: %TRUE if the preparation was successful, otherwise %FALSE
*
* Since: 0.9.0
- * Deprecated: since 0.UNRELEASED, use tp_proxy_prepare_finish() instead.
+ * Deprecated: since 0.15.6, use tp_proxy_prepare_finish() instead.
*/
gboolean
tp_account_prepare_finish (TpAccount *account,
diff --git a/telepathy-glib/channel-contacts.c b/telepathy-glib/channel-contacts.c
index bdd8dce36..98bb096f9 100644
--- a/telepathy-glib/channel-contacts.c
+++ b/telepathy-glib/channel-contacts.c
@@ -773,7 +773,7 @@ _tp_channel_contacts_self_contact_changed (TpChannel *self,
* <!-- -->
*
* Returns: (transfer none): the value of #TpChannel:target-contact
- * Since: 0.UNRELEASED
+ * Since: 0.15.6
*/
TpContact *
tp_channel_get_target_contact (TpChannel *self)
@@ -790,7 +790,7 @@ tp_channel_get_target_contact (TpChannel *self)
* <!-- -->
*
* Returns: (transfer none): the value of #TpChannel:initiator-contact
- * Since: 0.UNRELEASED
+ * Since: 0.15.6
*/
TpContact *
tp_channel_get_initiator_contact (TpChannel *self)
@@ -807,7 +807,7 @@ tp_channel_get_initiator_contact (TpChannel *self)
* <!-- -->
*
* Returns: (transfer none): the value of #TpChannel:group-self-contact
- * Since: 0.UNRELEASED
+ * Since: 0.15.6
*/
TpContact *
tp_channel_group_get_self_contact (TpChannel *self)
@@ -832,7 +832,7 @@ tp_channel_group_get_self_contact (TpChannel *self)
* Returns: (transfer container) (type GLib.PtrArray) (element-type TelepathyGLib.Contact):
* a new #GPtrArray of #TpContact, free it with g_ptr_array_unref(), or %NULL.
*
- * Since: 0.UNRELEASED
+ * Since: 0.15.6
*/
GPtrArray *
tp_channel_group_dup_members_contacts (TpChannel *self)
@@ -857,7 +857,7 @@ tp_channel_group_dup_members_contacts (TpChannel *self)
* Returns: (transfer container) (type GLib.PtrArray) (element-type TelepathyGLib.Contact):
* a new #GPtrArray of #TpContact, free it with g_ptr_array_unref(), or %NULL.
*
- * Since: 0.UNRELEASED
+ * Since: 0.15.6
*/
GPtrArray *
tp_channel_group_dup_local_pending_contacts (TpChannel *self)
@@ -882,7 +882,7 @@ tp_channel_group_dup_local_pending_contacts (TpChannel *self)
* Returns: (transfer container) (type GLib.PtrArray) (element-type TelepathyGLib.Contact):
* a new #GPtrArray of #TpContact, free it with g_ptr_array_unref(), or %NULL.
*
- * Since: 0.UNRELEASED
+ * Since: 0.15.6
*/
GPtrArray *
tp_channel_group_dup_remote_pending_contacts (TpChannel *self)
@@ -915,7 +915,7 @@ tp_channel_group_dup_remote_pending_contacts (TpChannel *self)
* and "" into @message, and return %FALSE.
*
* Returns: %TRUE if the contact is in fact local-pending
- * Since: 0.UNRELEASED
+ * Since: 0.15.6
*/
gboolean
tp_channel_group_get_local_pending_contact_info (TpChannel *self,
@@ -1014,7 +1014,7 @@ tp_channel_group_get_local_pending_contact_info (TpChannel *self,
*
* Returns: (transfer none): the global contact that owns the given contact,
* or %NULL.
- * Since: 0.UNRELEASED
+ * Since: 0.15.6
*/
TpContact *
tp_channel_group_get_contact_owner (TpChannel *self,
diff --git a/telepathy-glib/channel.c b/telepathy-glib/channel.c
index de8488a1a..236bb6ba9 100644
--- a/telepathy-glib/channel.c
+++ b/telepathy-glib/channel.c
@@ -204,7 +204,7 @@ tp_channel_get_feature_quark_group (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.UNRELEASED
+ * Since: 0.15.6
*/
GQuark
@@ -1878,7 +1878,7 @@ tp_channel_class_init (TpChannelClass *klass)
* finished preparing %TP_CHANNEL_FEATURE_CONTACTS; until then, it may be
* %NULL.
*
- * Since: 0.UNRELEASED
+ * Since: 0.15.6
*/
param_spec = g_param_spec_object ("target-contact", "Target Contact",
"The channel's target contact", TP_TYPE_CONTACT,
@@ -1908,7 +1908,7 @@ tp_channel_class_init (TpChannelClass *klass)
* finished preparing %TP_CHANNEL_FEATURE_CONTACTS; until then, it may be
* %NULL.
*
- * Since: 0.UNRELEASED
+ * Since: 0.15.6
*/
param_spec = g_param_spec_object ("initiator-contact", "Initiator Contact",
"Undefined if not a group", TP_TYPE_CONTACT,
@@ -1928,7 +1928,7 @@ tp_channel_class_init (TpChannelClass *klass)
*
* Change notification is via notify::group-self-contact.
*
- * Since: 0.UNRELEASED
+ * Since: 0.15.6
*/
param_spec = g_param_spec_object ("group-self-contact", "Group.SelfHandle",
"Undefined if not a group", TP_TYPE_CONTACT,
@@ -1960,7 +1960,7 @@ tp_channel_class_init (TpChannelClass *klass)
* finished preparing %TP_CHANNEL_FEATURE_CONTACTS; until then, it may be
* omitted.
*
- * Since: 0.UNRELEASED
+ * Since: 0.15.6
*/
signals[SIGNAL_GROUP_CONTACTS_CHANGED] = g_signal_new (
"group-contacts-changed", G_OBJECT_CLASS_TYPE (klass),
diff --git a/telepathy-glib/dbus-properties-mixin.c b/telepathy-glib/dbus-properties-mixin.c
index b5bee2abb..940fa0f40 100644
--- a/telepathy-glib/dbus-properties-mixin.c
+++ b/telepathy-glib/dbus-properties-mixin.c
@@ -992,7 +992,7 @@ tp_dbus_properties_mixin_make_properties_hash (
* function if the property is annotated with EmitsChangedSignal=false, or is
* unannotated.
*
- * Since: UNRELEASED
+ * Since: 0.15.6
*/
void
tp_dbus_properties_mixin_emit_properties_changed (
@@ -1083,7 +1083,7 @@ tp_dbus_properties_mixin_emit_properties_changed (
*
* A shortcut for calling tp_dbus_properties_mixin_emit_properties_changed().
*
- * Since: UNRELEASED
+ * Since: 0.15.6
*/
void
tp_dbus_properties_mixin_emit_properties_changed_varargs (
diff --git a/telepathy-glib/dbus-tube-channel.c b/telepathy-glib/dbus-tube-channel.c
index ec585c89e..7a60cd26d 100644
--- a/telepathy-glib/dbus-tube-channel.c
+++ b/telepathy-glib/dbus-tube-channel.c
@@ -26,7 +26,7 @@
* #TpDBusTubeChannel is a sub-class of #TpChannel providing convenient API
* to offer and accept a dbus tube.
*
- * Since: 0.15.UNRELEASED
+ * Since: 0.15.6
*/
/**
@@ -34,7 +34,7 @@
*
* Data structure representing a #TpDBusTubeChannel.
*
- * Since: 0.15.UNRELEASED
+ * Since: 0.15.6
*/
/**
@@ -42,7 +42,7 @@
*
* The class of a #TpDBusTubeChannel.
*
- * Since: 0.15.UNRELEASED
+ * Since: 0.15.6
*/
#include <config.h>
@@ -194,7 +194,7 @@ tp_dbus_tube_channel_class_init (TpDBusTubeChannelClass *klass)
*
* A string representing the service name that will be used over the tube.
*
- * Since: 0.15.UNRELEASED
+ * Since: 0.15.6
*/
param_spec = g_param_spec_string ("service-name", "Service Name",
"The service name of the dbus tube",
@@ -210,7 +210,7 @@ tp_dbus_tube_channel_class_init (TpDBusTubeChannelClass *klass)
*
* Will be %NULL for outgoing tubes until the tube has been offered.
*
- * Since: 0.15.UNRELEASED
+ * Since: 0.15.6
*/
param_spec = g_param_spec_boxed ("parameters", "Parameters",
"The parameters of the dbus tube",
@@ -264,7 +264,7 @@ _tp_dbus_tube_channel_new_with_factory (
*
* Returns: (transfer none): the value of #TpDBusTubeChannel:service-name
*
- * Since: 0.15.UNRELEASED
+ * Since: 0.15.6
*/
const gchar *
tp_dbus_tube_channel_get_service_name (TpDBusTubeChannel *self)
@@ -285,7 +285,7 @@ tp_dbus_tube_channel_get_service_name (TpDBusTubeChannel *self)
* Returns: (transfer none) (element-type utf8 GObject.Value):
* the value of #TpDBusTubeChannel:parameters
*
- * Since: 0.15.UNRELEASED
+ * Since: 0.15.6
*/
GHashTable *
tp_dbus_tube_channel_get_parameters (TpDBusTubeChannel *self)
diff --git a/telepathy-glib/errors.c b/telepathy-glib/errors.c
index 631f92c68..9255067a0 100644
--- a/telepathy-glib/errors.c
+++ b/telepathy-glib/errors.c
@@ -234,17 +234,17 @@
* <code>org.freedesktop.Telepathy.Error.Media.CodecsIncompatible</code>:
* Raised when the local streaming implementation has no codecs in common
* with the remote side.
- * Since: 0.UNRELEASED
+ * Since: 0.15.6
* @TP_ERROR_MEDIA_UNSUPPORTED_TYPE:
* <code>org.freedesktop.Telepathy.Error.Media.UnsupportedType</code>:
* The media stream type requested is not supported by either the local or
* remote side.
- * Since: 0.UNRELEASED
+ * Since: 0.15.6
* @TP_ERROR_MEDIA_STREAMING_ERROR:
* <code>org.freedesktop.Telepathy.Error.Media.StreamingError</code>:
* Raised when the call's streaming implementation has some kind of internal
* error.
- * Since: 0.UNRELEASED
+ * Since: 0.15.6
*
* Enumerated type representing the Telepathy D-Bus errors.
*/
diff --git a/telepathy-glib/protocol.c b/telepathy-glib/protocol.c
index a85f22f32..c8dcf0c59 100644
--- a/telepathy-glib/protocol.c
+++ b/telepathy-glib/protocol.c
@@ -728,7 +728,7 @@ tp_protocol_class_init (TpProtocolClass *klass)
* protocol, or %NULL if %TP_PROTOCOL_FEATURE_CORE has not been prepared or
* if the protocol doesn't support avatars.
*
- * Since: 0.15.UNRELEASED
+ * Since: 0.15.6
*/
g_object_class_install_property (object_class, PROP_AVATAR_REQUIREMENTS,
g_param_spec_pointer ("avatar-requirements",
@@ -1566,7 +1566,7 @@ _tp_protocol_parse_manager_file (GKeyFile *file,
*
* Returns: (transfer none): the value of #TpProtocol:avatar-requirements
*
- * Since: 0.15.UNRELEASED
+ * Since: 0.15.6
*/
TpAvatarRequirements *
tp_protocol_get_avatar_requirements (TpProtocol *self)
diff --git a/telepathy-glib/versions/0.15.6.abi b/telepathy-glib/versions/0.15.6.abi
new file mode 100644
index 000000000..e70f0c49e
--- /dev/null
+++ b/telepathy-glib/versions/0.15.6.abi
@@ -0,0 +1,23 @@
+Version: TELEPATHY_GLIB_0.15.6
+Extends: TELEPATHY_GLIB_0.15.5
+Release: 0.15.6
+
+tp_dbus_properties_mixin_emit_properties_changed
+tp_dbus_properties_mixin_emit_properties_changed_varargs
+tp_channel_get_target_contact
+tp_channel_get_initiator_contact
+tp_channel_get_feature_quark_contacts
+tp_channel_group_get_contact_owner
+tp_channel_group_get_self_contact
+tp_channel_group_dup_members_contacts
+tp_channel_group_dup_local_pending_contacts
+tp_channel_group_dup_remote_pending_contacts
+tp_channel_group_get_local_pending_contact_info
+tp_cli_channel_interface_group_connect_to_handle_owners_changed_detailed
+tp_cli_channel_interface_group_connect_to_self_contact_changed
+tp_svc_channel_interface_group_emit_handle_owners_changed_detailed
+tp_svc_channel_interface_group_emit_self_contact_changed
+tp_protocol_get_avatar_requirements
+tp_dbus_tube_channel_get_parameters
+tp_dbus_tube_channel_get_service_name
+tp_dbus_tube_channel_get_type
View Lorry Controller Status