Prepare version 0.11.13telepathy-glib-0.11.13

9 files changed, 72 insertions, 18 deletions

diff --git a/NEWS b/NEWS
index c1c9ab0f4..4e7340aa1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,41 @@
-telepathy-glib 0.11.13 (UNRELEASED)
+telepathy-glib 0.11.13 (2010-08-17)
 ===================================
 
-…
+Dependencies:
+
+• When building from git or otherwise running automake, automake 1.11 is
+  strongly recommended. If an older version is used, it will not be possible
+  to generate Vala bindings, or to make tarball distributions.
+
+Changes to experimental API:
+
+• fd.o #29070: remove telepathy-vala.pc. Vala bindings should ask pkg-config
+  for telepathy-glib, and can check that the VAPI file exists by attempting
+  to link a trivial Vala program; see libfolks for example code (cassidy)
+
+Enhancements:
+
+• fd.o #29358: add TP_ERROR as an alias for TP_ERRORS, for introspectability
+  (pwithnall)
+
+• add TP_USER_ACTION_TIME_NOT_USER_ACTION, TP_USER_ACTION_TIME_CURRENT_TIME,
+  tp_user_action_time_from_x11, tp_user_action_time_should_present (smcv)
+
+• improve various documentation (smcv, danni)
+
+• convert TpBaseClient virtual methods into normal GObject virtual methods
+  so they can be introspected (smcv)
+
+Fixes:
+
+• Don't rely on vala-1.0.pc to check for vala version and vapigen (treitter)
+
+• fd.o #25019: let the TpPresenceMixin work on connections that implement
+  SimplePresence but not complex Presence (Butch Howard)
+
+• Fix a harmless misuse of enums that caused warnings on gcc 4.5 (smcv)
+
+• Fix out-of-tree builds with Vala enabled (smcv)
 
 telepathy-glib 0.11.12 (2010-08-10)
 ===================================
diff --git a/configure.ac b/configure.ac
index 2acbe143e..fe7568227 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], [12])
-m4_define([tp_glib_nano_version], [1])
+m4_define([tp_glib_micro_version], [13])
+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], [41])
+m4_define([tp_glib_lt_current], [42])
 m4_define([tp_glib_lt_revision], [0])
-m4_define([tp_glib_lt_age], [41])
+m4_define([tp_glib_lt_age], [42])
 
 # Some magic
 m4_define([tp_glib_base_version],
diff --git a/telepathy-glib/abi.am b/telepathy-glib/abi.am
index 4281be760..27b495757 100644
--- a/telepathy-glib/abi.am
+++ b/telepathy-glib/abi.am
@@ -45,7 +45,8 @@ ABI_LISTS = \
     versions/0.11.7.abi \
     versions/0.11.9.abi \
     versions/0.11.11.abi \
-    versions/0.11.12.abi
+    versions/0.11.12.abi \
+    versions/0.11.13.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/base-client.c b/telepathy-glib/base-client.c
index 769a0112b..e89089561 100644
--- a/telepathy-glib/base-client.c
+++ b/telepathy-glib/base-client.c
@@ -43,14 +43,22 @@
  * TpBaseClientClass:
  * @parent_class: the parent class
  * @observe_channels: the function called to observe newly-created channels
- *  matching this client's observer filter
+ *  matching this client's observer filter (since 0.11.13)
  * @add_dispatch_operation: the function called to request user approval of
  *  unrequested (incoming) channels matching this client's approver filter
+ *  (since 0.11.13)
  * @handle_channels: the function called to handle channels matching this
- *  client's handler filter
+ *  client's handler filter (since 0.11.13)
  *
  * The class of a #TpBaseClient.
  *
+ * The virtual methods @observe_channels, @add_dispatch_operation and
+ * @handle_channels can be also implemented by calling
+ * tp_base_client_implement_observe_channels(),
+ * tp_base_client_implement_add_dispatch_operation() and
+ * tp_base_client_implement_handle_channels(). This is compatible with
+ * telepathy-glib versions older than 0.11.13.
+ *
  * Since: 0.11.5
  */
 
@@ -1990,7 +1998,7 @@ requests_iface_init (gpointer g_iface,
  * Called by subclasses to define the actual implementation of the
  * ObserveChannels() D-Bus method.
  *
- * Since 0.11.UNRELEASED this is exactly equivalent to setting the
+ * Since 0.11.13 this is exactly equivalent to setting the
  * #TpBaseClientClass.observe_channels function pointer.
  *
  * Since: 0.11.5
@@ -2104,7 +2112,7 @@ tp_base_client_get_dbus_daemon (TpBaseClient *self)
  * Called by subclasses to define the actual implementation of the
  * AddDispatchOperation() D-Bus method.
  *
- * Since 0.11.UNRELEASED this is exactly equivalent to setting the
+ * Since 0.11.13 this is exactly equivalent to setting the
  * #TpBaseClientClass.add_dispatch_operation function pointer.
  *
  * Since: 0.11.5
@@ -2125,7 +2133,7 @@ tp_base_client_implement_add_dispatch_operation (TpBaseClientClass *cls,
  * Called by subclasses to define the actual implementation of the
  * HandleChannels() D-Bus method.
  *
- * Since 0.11.UNRELEASED this is exactly equivalent to setting the
+ * Since 0.11.13 this is exactly equivalent to setting the
  * #TpBaseClientClass.handle_channels function pointer.
  *
  * Since: 0.11.6
diff --git a/telepathy-glib/defs.h b/telepathy-glib/defs.h
index 285471771..c2f411947 100644
--- a/telepathy-glib/defs.h
+++ b/telepathy-glib/defs.h
@@ -120,7 +120,7 @@ G_BEGIN_DECLS
  * tp_user_action_time_from_x11(), tp_user_action_time_should_present() and
  * %TP_USER_ACTION_TIME_CURRENT_TIME.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.13
  */
 #define TP_USER_ACTION_TIME_NOT_USER_ACTION (G_GINT64_CONSTANT (0))
 
@@ -137,7 +137,7 @@ G_BEGIN_DECLS
  * tp_user_action_time_from_x11(), tp_user_action_time_should_present() and
  * %TP_USER_ACTION_TIME_NOT_USER_ACTION.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.13
  */
 #define TP_USER_ACTION_TIME_CURRENT_TIME (G_MAXINT64)
 
diff --git a/telepathy-glib/errors.c b/telepathy-glib/errors.c
index 097697726..5343b6090 100644
--- a/telepathy-glib/errors.c
+++ b/telepathy-glib/errors.c
@@ -262,7 +262,7 @@ tp_errors_quark (void)
  *
  * Return the error domain quark for #TpError.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.13
  */
 GQuark
 tp_error_quark (void)
diff --git a/telepathy-glib/presence-mixin.c b/telepathy-glib/presence-mixin.c
index b37b7b132..fc72e6971 100644
--- a/telepathy-glib/presence-mixin.c
+++ b/telepathy-glib/presence-mixin.c
@@ -29,7 +29,7 @@
  * SimplePresence and/or Presence interfaces. Implementing both interfaces
  * (as described below) is recommended. In particular, you must implement the
  * old-style Presence interface if compatibility with telepathy-glib
- * versions older than 0.11.UNRELEASED is required.
+ * versions older than 0.11.13 is required.
  *
  * To use the presence mixin, include a #TpPresenceMixinClass somewhere in your
  * class structure and a #TpPresenceMixin somewhere in your instance structure,
@@ -82,10 +82,10 @@
  *   interface.
  * </para>
  * <para>
- *   In telepathy-glib versions older than 0.11.UNRELEASED, every connection
+ *   In telepathy-glib versions older than 0.11.13, every connection
  *   that used the #TpPresenceMixin was required to implement
  *   #TpSvcConnectionInterfacePresence; failing to do so would lead to an
- *   assertion failure. Since 0.11.UNRELEASED, this is no longer required.
+ *   assertion failure. Since 0.11.13, this is no longer required.
  * </para>
  * </section> <!-- complex Presence -->
  *
diff --git a/telepathy-glib/util.c b/telepathy-glib/util.c
index 7739fb5c6..bb12224e4 100644
--- a/telepathy-glib/util.c
+++ b/telepathy-glib/util.c
@@ -1377,6 +1377,8 @@ tp_simple_async_report_success_in_idle (GObject *source,
  *
  * Returns: a nonzero Telepathy user action time, or
  *  %TP_USER_ACTION_TIME_CURRENT_TIME
+ *
+ * Since: 0.11.13
  */
 gint64
 tp_user_action_time_from_x11 (guint32 x11_time)
@@ -1405,6 +1407,8 @@ tp_user_action_time_from_x11 (guint32 x11_time)
  * versions.
  *
  * Returns: %TRUE if it would be appropriate to present a window
+ *
+ * Since: 0.11.13
  */
 
 gboolean
diff --git a/telepathy-glib/versions/0.11.13.abi b/telepathy-glib/versions/0.11.13.abi
new file mode 100644
index 000000000..eb4bf8e2c
--- /dev/null
+++ b/telepathy-glib/versions/0.11.13.abi
@@ -0,0 +1,7 @@
+Version: TELEPATHY_GLIB_0.11.13
+Extends: TELEPATHY_GLIB_0.11.12
+Release: 0.11.13
+
+tp_error_quark
+tp_user_action_time_from_x11
+tp_user_action_time_should_present