summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2011-02-01 15:56:00 +0000
committerWill Thompson <will.thompson@collabora.co.uk>2011-02-01 16:04:14 +0000
commit1f21d513ca152b7cd30cce36b294f6a9ac514d98 (patch)
tree27c4cabe9d25ec25d827c3459ad9379e540f0de6
parent85a35a0a18ff62624b060f13325b77ed95bfc175 (diff)
Version 0.13.12telepathy-glib-0.13.12
-rw-r--r--configure.ac4
-rw-r--r--telepathy-glib/abi.am1
-rw-r--r--telepathy-glib/contact.c16
-rw-r--r--telepathy-glib/versions/0.13.12.abi9
4 files changed, 20 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index 6aab37811..5168759ea 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], [13])
-m4_define([tp_glib_micro_version], [11])
-m4_define([tp_glib_nano_version], [1])
+m4_define([tp_glib_micro_version], [12])
+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/telepathy-glib/abi.am b/telepathy-glib/abi.am
index 066e2e22c..354bf5a9d 100644
--- a/telepathy-glib/abi.am
+++ b/telepathy-glib/abi.am
@@ -61,6 +61,7 @@ ABI_LISTS = \
versions/0.13.9.abi \
versions/0.13.10.abi \
versions/0.13.11.abi \
+ versions/0.13.12.abi \
$(NULL)
# The quoting here is unnecessary but harmless, and has the useful side-effect
diff --git a/telepathy-glib/contact.c b/telepathy-glib/contact.c
index 5aed0b2ba..5801aa528 100644
--- a/telepathy-glib/contact.c
+++ b/telepathy-glib/contact.c
@@ -103,7 +103,7 @@ struct _TpContact {
* @TP_CONTACT_FEATURE_SUBSCRIPTION_STATES: #TpContact:subscribe-state,
* #TpContact:publish-state and #TpContact:publish-request. Require a
* Connection implementing the %TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST
- * interface. (available since 0.13.UNRELEASED)
+ * interface. (available since 0.13.12)
*
* Enumeration representing the features a #TpContact can optionally support.
* When requesting a #TpContact, library users specify the desired features;
@@ -570,7 +570,7 @@ tp_contact_get_contact_info (TpContact *self)
*
* Returns: the value of #TpContact:subscribe-state.
*
- * Since: 0.13.UNRELEASED
+ * Since: 0.13.12
*/
TpSubscriptionState
tp_contact_get_subscribe_state (TpContact *self)
@@ -592,7 +592,7 @@ tp_contact_get_subscribe_state (TpContact *self)
*
* Returns: the value of #TpContact:publish-state.
*
- * Since: 0.13.UNRELEASED
+ * Since: 0.13.12
*/
TpSubscriptionState
tp_contact_get_publish_state (TpContact *self)
@@ -617,7 +617,7 @@ tp_contact_get_publish_state (TpContact *self)
* Returns: the value of #TpContact:publish-request.
*
- * Since: 0.13.UNRELEASED
+ * Since: 0.13.12
*/
const gchar *
tp_contact_get_publish_request (TpContact *self)
@@ -1064,7 +1064,7 @@ tp_contact_class_init (TpContactClass *klass)
* This is set to %TP_SUBSCRIPTION_STATE_UNKNOWN until
* %TP_CONTACT_FEATURE_SUBSCRIPTION_STATES has been prepared
*
- * Since: 0.13.UNRELEASED
+ * Since: 0.13.12
*/
param_spec = g_param_spec_uint ("subscribe-state",
"Subscribe State",
@@ -1085,7 +1085,7 @@ tp_contact_class_init (TpContactClass *klass)
* This is set to %TP_SUBSCRIPTION_STATE_UNKNOWN until
* %TP_CONTACT_FEATURE_SUBSCRIPTION_STATES has been prepared
*
- * Since: 0.13.UNRELEASED
+ * Since: 0.13.12
*/
param_spec = g_param_spec_uint ("publish-state",
"Publish State",
@@ -1107,7 +1107,7 @@ tp_contact_class_init (TpContactClass *klass)
* This is set to %NULL until %TP_CONTACT_FEATURE_SUBSCRIPTION_STATES has been
* prepared, and it is guaranteed to be non-%NULL afterward.
*
- * Since: 0.13.UNRELEASED
+ * Since: 0.13.12
*/
param_spec = g_param_spec_string ("publish-request",
"Publish Request",
@@ -1126,7 +1126,7 @@ tp_contact_class_init (TpContactClass *klass)
*
* Emitted when this contact's subscription states changes.
*
- * Since: 0.13.UNRELEASED
+ * Since: 0.13.12
*/
signals[SIGNAL_SUBSCRIPTION_STATES_CHANGED] = g_signal_new (
"subscription-states-changed",
diff --git a/telepathy-glib/versions/0.13.12.abi b/telepathy-glib/versions/0.13.12.abi
new file mode 100644
index 000000000..bac096091
--- /dev/null
+++ b/telepathy-glib/versions/0.13.12.abi
@@ -0,0 +1,9 @@
+Version: TELEPATHY_GLIB_0.13.12
+Extends: TELEPATHY_GLIB_0.13.11
+Release: 0.13.12
+
+tp_cli_channel_type_file_transfer_connect_to_uri_defined
+tp_contact_get_publish_request
+tp_contact_get_publish_state
+tp_contact_get_subscribe_state
+tp_svc_channel_type_file_transfer_emit_uri_defined