Prepare version 0.7.18telepathy-glib-0.7.18

4 files changed, 41 insertions, 7 deletions

diff --git a/NEWS b/NEWS
index 2f1e10435..a77168f0d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,16 @@
-telepathy-glib 0.7.18 (UNRELEASED)
+telepathy-glib 0.7.18 (2008-11-03)
 ==================================
 
+The "320 GB" release.
+
 Enhancements:
 
 * Update to spec 0.17.14
   * test, and generate code for, the Destroyable interface
   * add support for the SCROLLBACK and RESCUED message flags in Text
-  * add tp_text_mixin_set_rescued(), for CMs to call when respawning a channel
+  * add tp_text_mixin_set_rescued(), for CMs to call when respawning a channel,
+    and tp_text_mixin_receive_with_flags(), for CMs to call when receiving
+    scrollback messages
   * update echo example CM's Text support to spec 0.17.14
   * CreateChannel etc. return before NewChannels, which is emitted before
     NewChannel
@@ -16,6 +20,11 @@ Enhancements:
 
 Fixes:
 
+* In TpContactsMixin, always return info from interface TP_IFACE_CONNECTION
+  even if the client didn't ask for it, since the spec says we should
+
+* Add a simple regression test for TpContactsMixin
+
 * Use unsigned int (rather than gboolean, which is signed!) for bitfields
 
 * Fix a memory leak when a TpChannel with the Group interface is freed
diff --git a/configure.ac b/configure.ac
index 3f68f2a21..4b64f2631 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], [7])
-m4_define([tp_glib_micro_version], [17])
-m4_define([tp_glib_nano_version], [1])
+m4_define([tp_glib_micro_version], [18])
+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], [18])
+m4_define([tp_glib_lt_current], [19])
 m4_define([tp_glib_lt_revision], [0])
-m4_define([tp_glib_lt_age], [18])
+m4_define([tp_glib_lt_age], [19])
 
 # Some magic
 m4_define([tp_glib_base_version],
diff --git a/telepathy-glib/Makefile.am b/telepathy-glib/Makefile.am
index 902ea0104..347c97c40 100644
--- a/telepathy-glib/Makefile.am
+++ b/telepathy-glib/Makefile.am
@@ -20,7 +20,8 @@ ABI_LISTS = \
     versions/0.7.14.abi \
     versions/0.7.15.abi \
     versions/0.7.16.abi \
-    versions/0.7.17.abi
+    versions/0.7.17.abi \
+    versions/0.7.18.abi
 
 EXTRA_DIST = \
     $(ABI_LISTS) \
diff --git a/telepathy-glib/versions/0.7.18.abi b/telepathy-glib/versions/0.7.18.abi
new file mode 100644
index 000000000..adff118bb
--- /dev/null
+++ b/telepathy-glib/versions/0.7.18.abi
@@ -0,0 +1,24 @@
+Version: TELEPATHY_GLIB_0.7.18
+Extends: TELEPATHY_GLIB_0.7.17
+Release: 0.7.18
+
+tp_cli_channel_interface_destroyable_call_destroy
+tp_cli_channel_interface_destroyable_run_destroy
+tp_connection_get_contacts_by_handle
+tp_connection_get_contacts_by_id
+tp_connection_upgrade_contacts
+tp_contact_get_alias
+tp_contact_get_avatar_token
+tp_contact_get_connection
+tp_contact_get_handle
+tp_contact_get_identifier
+tp_contact_get_presence_message
+tp_contact_get_presence_status
+tp_contact_get_presence_type
+tp_contact_get_type
+tp_contact_has_feature
+tp_iface_quark_channel_interface_destroyable
+tp_svc_channel_interface_destroyable_get_type
+tp_svc_channel_interface_destroyable_implement_destroy
+tp_text_mixin_receive_with_flags
+tp_text_mixin_set_rescued