summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2012-04-02 16:31:18 -0400
committerJonny Lamb <jonny.lamb@collabora.co.uk>2012-04-02 16:31:18 -0400
commit95b3336d2d43fdbfe61692144dca8700e0ad0071 (patch)
treeac7c3535301a6649e8932eb18791585051dc202a
parent7d8094e59bf346b092f7a51e21afd0e7d9df6f1a (diff)
version 0.18.0telepathy-glib-0.18.0
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
-rw-r--r--Makefile.am2
-rw-r--r--NEWS2
-rw-r--r--configure.ac10
-rw-r--r--telepathy-glib/abi.am1
-rw-r--r--telepathy-glib/base-contact-list.c14
-rw-r--r--telepathy-glib/dbus-tube-channel.c10
-rw-r--r--telepathy-glib/versions/0.18.0.abi12
7 files changed, 32 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am
index 086eff19c..1948f352a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,7 +48,7 @@ upload-branch-docs: all
include tools/lcov.am
-CHANGELOG_RANGE = telepathy-glib-0.12.0..
+CHANGELOG_RANGE = telepathy-glib-0.14.0..
CHECK_FOR_UNRELEASED = $(srcdir)/NEWS $(wildcard $(srcdir)/telepathy-glib/*.[ch])
include tools/telepathy.am
diff --git a/NEWS b/NEWS
index 4c5b6e7e4..463d476b7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-telepathy-glib 0.18.0 (UNRELEASED)
+telepathy-glib 0.18.0 (2012-04-02)
==================================
This is the start of a new stable branch. We encourage those shipping
diff --git a/configure.ac b/configure.ac
index 3d6ae4792..ecd1b5a67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,9 +10,9 @@ AC_PREREQ([2.59])
# set nano_version to 1
m4_define([tp_glib_major_version], [0])
-m4_define([tp_glib_minor_version], [17])
-m4_define([tp_glib_micro_version], [7])
-m4_define([tp_glib_nano_version], [1])
+m4_define([tp_glib_minor_version], [18])
+m4_define([tp_glib_micro_version], [0])
+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], [69])
+m4_define([tp_glib_lt_current], [70])
m4_define([tp_glib_lt_revision], [0])
-m4_define([tp_glib_lt_age], [69])
+m4_define([tp_glib_lt_age], [70])
# Some magic
m4_define([tp_glib_base_version],
diff --git a/telepathy-glib/abi.am b/telepathy-glib/abi.am
index 90626f3a0..b249fa269 100644
--- a/telepathy-glib/abi.am
+++ b/telepathy-glib/abi.am
@@ -84,6 +84,7 @@ ABI_LISTS = \
versions/0.17.5.abi \
versions/0.17.6.abi \
versions/0.17.7.abi \
+ versions/0.18.0.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 bf7d906c8..38887aedb 100644
--- a/telepathy-glib/base-contact-list.c
+++ b/telepathy-glib/base-contact-list.c
@@ -143,9 +143,9 @@
* @download_async: the implementation of
* tp_base_contact_list_download_async(); if a subclass does not implement
* this itself, the default implementation will raise
- * TP_ERROR_NOT_IMPLEMENTED asynchronously. Since: 0.UNRELEASED
+ * TP_ERROR_NOT_IMPLEMENTED asynchronously. Since: 0.18.0
* @download_finish: the implementation of
- * tp_base_contact_list_download_finish(). Since: 0.UNRELEASED
+ * tp_base_contact_list_download_finish(). Since: 0.18.0
*
* The class of a #TpBaseContactList.
*
@@ -204,7 +204,7 @@
*
* Signature of a virtual method that needs no additional information.
*
- * Since: 0.UNRELEASED
+ * Since: 0.18.0
*/
/**
@@ -979,7 +979,7 @@ tp_base_contact_list_class_init (TpBaseContactListClass *cls)
* Implementations should check this property when they become connected
* and in their Download method, and behave accordingly.
*
- * Since: 0.UNRELEASED
+ * Since: 0.18.0
*/
g_object_class_install_property (object_class, PROP_DOWNLOAD_AT_CONNECTION,
g_param_spec_boolean ("download-at-connection", "Download at connection",
@@ -3164,7 +3164,7 @@ tp_base_contact_list_get_contact_list_persists (TpBaseContactList *self)
*
* Returns: the #TpBaseContactList:download-at-connection property
*
- * Since: 0.UNRELEASED
+ * Since: 0.18.0
*/
gboolean
tp_base_contact_list_get_download_at_connection (TpBaseContactList *self)
@@ -3185,7 +3185,7 @@ tp_base_contact_list_get_download_at_connection (TpBaseContactList *self)
* download_async, the default implementation will raise
* TP_ERROR_NOT_IMPLEMENTED asynchronously.
*
- * Since: 0.UNRELEASED
+ * Since: 0.18.0
*/
void
tp_base_contact_list_download_async (TpBaseContactList *self,
@@ -3216,7 +3216,7 @@ tp_base_contact_list_download_async (TpBaseContactList *self,
*
* Returns: %TRUE on success or %FALSE on error
*
- * Since: 0.UNRELEASED
+ * Since: 0.18.0
*/
gboolean
tp_base_contact_list_download_finish (TpBaseContactList *self,
diff --git a/telepathy-glib/dbus-tube-channel.c b/telepathy-glib/dbus-tube-channel.c
index 998cb9957..3ce22c2be 100644
--- a/telepathy-glib/dbus-tube-channel.c
+++ b/telepathy-glib/dbus-tube-channel.c
@@ -519,7 +519,7 @@ tp_dbus_tube_channel_get_parameters (TpDBusTubeChannel *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.UNRELEASED
+ * Since: 0.18.0
*/
GQuark
tp_dbus_tube_channel_feature_quark_core (void)
@@ -607,7 +607,7 @@ out:
* tp_dbus_tube_channel_offer_finish() to get the #GDBusConnection that will
* be used to communicate through the tube.
*
- * Since: 0.UNRELEASED
+ * Since: 0.18.0
*/
void
tp_dbus_tube_channel_offer_async (TpDBusTubeChannel *self,
@@ -642,7 +642,7 @@ tp_dbus_tube_channel_offer_async (TpDBusTubeChannel *self,
* Returns: (transfer full): a reference on a #GDBusConnection if the tube
* has been successfully offered and opened; %NULL otherwise.
*
- * Since: 0.UNRELEASED
+ * Since: 0.18.0
*/
GDBusConnection *
tp_dbus_tube_channel_offer_finish (TpDBusTubeChannel *self,
@@ -720,7 +720,7 @@ proxy_prepare_accept_cb (GObject *source,
* tp_dbus_tube_channel_accept_finish() to get the #GDBusConnection that will
* be used to communicate through the tube.
*
- * Since: 0.UNRELEASED
+ * Since: 0.18.0
*/
void
tp_dbus_tube_channel_accept_async (TpDBusTubeChannel *self,
@@ -752,7 +752,7 @@ tp_dbus_tube_channel_accept_async (TpDBusTubeChannel *self,
* Returns: (transfer full): a reference on a #GDBusConnection if the tube
* has been successfully accepted and opened; %NULL otherwise.
*
- * Since: 0.UNRELEASED
+ * Since: 0.18.0
*/
GDBusConnection *
tp_dbus_tube_channel_accept_finish (TpDBusTubeChannel *self,
diff --git a/telepathy-glib/versions/0.18.0.abi b/telepathy-glib/versions/0.18.0.abi
new file mode 100644
index 000000000..0ade1606f
--- /dev/null
+++ b/telepathy-glib/versions/0.18.0.abi
@@ -0,0 +1,12 @@
+Version: TELEPATHY_GLIB_0.18.0
+Extends: TELEPATHY_GLIB_0.17.7
+Release: 0.18.0
+
+tp_dbus_tube_channel_accept_async
+tp_dbus_tube_channel_accept_finish
+tp_dbus_tube_channel_offer_async
+tp_dbus_tube_channel_offer_finish
+tp_dbus_tube_channel_feature_quark_core
+tp_base_contact_list_get_download_at_connection
+tp_base_contact_list_download_async
+tp_base_contact_list_download_finish \ No newline at end of file