Prepare release 0.11.12telepathy-glib-0.11.12

6 files changed, 48 insertions, 28 deletions

diff --git a/NEWS b/NEWS
index fb318a3cd..3adca2d06 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
-telepathy-glib 0.11.12 (UNRELEASED)
+telepathy-glib 0.11.12 (2010-08-10)
 ===================================
 
+The “Fire and Forget” release.
+
 Enhancements:
 
 • Added TpAccountChannelRequest, a request to create or ensure a channel (cassidy)
diff --git a/configure.ac b/configure.ac
index 5d9ed0a9d..fc87da2a2 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], [11])
-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,
@@ -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], [40])
+m4_define([tp_glib_lt_current], [41])
 m4_define([tp_glib_lt_revision], [0])
-m4_define([tp_glib_lt_age], [40])
+m4_define([tp_glib_lt_age], [41])
 
 # Some magic
 m4_define([tp_glib_base_version],
diff --git a/telepathy-glib/abi.am b/telepathy-glib/abi.am
index 9f7273cb2..4281be760 100644
--- a/telepathy-glib/abi.am
+++ b/telepathy-glib/abi.am
@@ -44,7 +44,8 @@ ABI_LISTS = \
     versions/0.11.6.abi \
     versions/0.11.7.abi \
     versions/0.11.9.abi \
-    versions/0.11.11.abi
+    versions/0.11.11.abi \
+    versions/0.11.12.abi
 
 # The quoting here is unnecessary but harmless, and has the useful side-effect
 # that vim quickfix mode (:make) doesn't interpret the libtool --mode=link
diff --git a/telepathy-glib/account-channel-request.c b/telepathy-glib/account-channel-request.c
index 58c3b9317..8c863db1c 100644
--- a/telepathy-glib/account-channel-request.c
+++ b/telepathy-glib/account-channel-request.c
@@ -36,7 +36,7 @@
  * has to be re-handled. This can be useful for example to move its window
  * to the foreground, if applicable.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.12
  */
 
 /**
@@ -44,7 +44,7 @@
  *
  * Data structure representing a #TpAccountChannelRequest object.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.12
  */
 
 /**
@@ -52,7 +52,7 @@
  *
  * The class of a #TpAccountChannelRequest.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.12
  */
 
 #include "telepathy-glib/account-channel-request.h"
@@ -269,7 +269,7 @@ tp_account_channel_request_class_init (
    *
    * This property can't be %NULL.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.12
    */
   param_spec = g_param_spec_object ("account", "TpAccount",
       "The TpAccount used to request the channel",
@@ -286,7 +286,7 @@ tp_account_channel_request_class_init (
    *
    * This property can't be %NULL.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.12
    */
   param_spec = g_param_spec_boxed ("request", "GHashTable",
       "A dictionary containing desirable properties for the channel",
@@ -301,7 +301,7 @@ tp_account_channel_request_class_init (
    * The user action time that will be passed to mission-control when
    * requesting the channel.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.12
    */
   param_spec = g_param_spec_int64 ("user-action-time", "user action time",
       "UserActionTime",
@@ -321,7 +321,7 @@ tp_account_channel_request_class_init (
    *
    * Emitted when channel which has been created using @self has be re-handled.
    *
-   * Since: 0.11.UNRELEASED
+   * Since: 0.11.12
    */
   signals[SIGNAL_RE_HANDLED] = g_signal_new (
       "re-handled", G_OBJECT_CLASS_TYPE (cls),
@@ -345,7 +345,7 @@ tp_account_channel_request_class_init (
  *
  * Returns: a new #TpAccountChannelRequest object
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.12
  */
 TpAccountChannelRequest *
 tp_account_channel_request_new (
@@ -371,7 +371,7 @@ tp_account_channel_request_new (
  *
  * Returns: (transfer none): the value of #TpAccountChannelRequest:account
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.12
  */
 TpAccount *
 tp_account_channel_request_get_account (
@@ -388,7 +388,7 @@ tp_account_channel_request_get_account (
  *
  * Returns: (transfer none): the value of #TpAccountChannelRequest:request
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.12
  */
 GHashTable *
 tp_account_channel_request_get_request (
@@ -405,7 +405,7 @@ tp_account_channel_request_get_request (
  *
  * Returns: the value of #TpAccountChannelRequest:user-action-time
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.12
  */
 gint64
 tp_account_channel_request_get_user_action_time (
@@ -778,7 +778,7 @@ request_and_handle_channel_finish (TpAccountChannelRequest *self,
  * tp_account_channel_request_create_and_handle_channel_finish() to get the
  * result of the operation.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.12
  */
 void
 tp_account_channel_request_create_and_handle_channel_async (
@@ -805,7 +805,7 @@ tp_account_channel_request_create_and_handle_channel_async (
  * Returns: (transfer full) (allow-none): a new reference on a #TpChannel if the
  * channel was successfully created and you are handling it, otherwise %NULL.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.12
  */
 TpChannel *
 tp_account_channel_request_create_and_handle_channel_finish (
@@ -838,7 +838,7 @@ tp_account_channel_request_create_and_handle_channel_finish (
  * will be notified that the channel was requested again, and can
  * move its window to the foreground, if applicable.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.12
  */
 void
 tp_account_channel_request_ensure_and_handle_channel_async (
@@ -869,7 +869,7 @@ tp_account_channel_request_ensure_and_handle_channel_async (
  * Returns: (transfer full) (allow-none): a new reference on a #TpChannel if the
  * channel was successfully created and you are handling it, otherwise %NULL.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.12
  */
 TpChannel *
 tp_account_channel_request_ensure_and_handle_channel_finish (
@@ -958,7 +958,7 @@ request_channel_async (TpAccountChannelRequest *self,
  * You can then call tp_account_channel_request_create_channel_finish() to
  * get the result of the operation.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.12
  */
 void
 tp_account_channel_request_create_channel_async (
@@ -1007,7 +1007,7 @@ request_channel_finish (TpAccountChannelRequest *self,
  * Returns: %TRUE if the channel was successfully created and dispatched,
  * otherwise %FALSE.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.12
  */
 gboolean
 tp_account_channel_request_create_channel_finish (
@@ -1038,7 +1038,7 @@ tp_account_channel_request_create_channel_finish (
  * You can then call tp_account_channel_request_ensure_channel_finish() to
  * get the result of the operation.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.12
  */
 void
 tp_account_channel_request_ensure_channel_async (
@@ -1064,7 +1064,7 @@ tp_account_channel_request_ensure_channel_async (
  * Returns: %TRUE if the channel was successfully ensured and (re-)dispatched,
  * otherwise %FALSE.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.12
  */
 gboolean
 tp_account_channel_request_ensure_channel_finish (
diff --git a/telepathy-glib/errors.c b/telepathy-glib/errors.c
index 63c74f6d1..5ee09d3e3 100644
--- a/telepathy-glib/errors.c
+++ b/telepathy-glib/errors.c
@@ -175,16 +175,16 @@
  * @TP_ERROR_CERT_REVOKED: org.freedesktop.Telepathy.Error.Cert.Revoked:
  *     Raised if the server provided an SSL/TLS certificate that has been
  *     revoked.
- *     Since: 0.11.UNRELEASED
+ *     Since: 0.11.12
  * @TP_ERROR_CERT_INSECURE: org.freedesktop.Telepathy.Error.Cert.Insecure:
  *     Raised if the server provided an SSL/TLS certificate that uses an
  *     insecure cipher algorithm or is cryptographically weak.
- *     Since: 0.11.UNRELEASED
+ *     Since: 0.11.12
  * @TP_ERROR_CERT_LIMIT_EXCEEDED: org.freedesktop.Telepathy.Error.Cert.LimitExceeded:
  *     Raised if the length in bytes of the server certificate, or the depth
  *     of the server certificate chain, exceed the limits imposed by the
  *     crypto library.
- *     Since: 0.11.UNRELEASED
+ *     Since: 0.11.12
  *
  * Enumerated type representing the Telepathy D-Bus errors.
  */
diff --git a/telepathy-glib/versions/0.11.12.abi b/telepathy-glib/versions/0.11.12.abi
new file mode 100644
index 000000000..5a53d2a4d
--- /dev/null
+++ b/telepathy-glib/versions/0.11.12.abi
@@ -0,0 +1,17 @@
+Version: TELEPATHY_GLIB_0.11.12
+Extends: TELEPATHY_GLIB_0.11.11
+Release: 0.11.12
+
+tp_account_channel_request_create_and_handle_channel_async
+tp_account_channel_request_create_and_handle_channel_finish
+tp_account_channel_request_create_channel_async
+tp_account_channel_request_create_channel_finish
+tp_account_channel_request_ensure_and_handle_channel_async
+tp_account_channel_request_ensure_and_handle_channel_finish
+tp_account_channel_request_ensure_channel_async
+tp_account_channel_request_ensure_channel_finish
+tp_account_channel_request_get_account
+tp_account_channel_request_get_request
+tp_account_channel_request_get_type
+tp_account_channel_request_get_user_action_time
+tp_account_channel_request_new