diff options
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | README | 8 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | telepathy-glib/account.c | 4 | ||||
| -rw-r--r-- | telepathy-glib/channel.c | 16 | ||||
| -rw-r--r-- | telepathy-glib/connection-handles.c | 4 | ||||
| -rw-r--r-- | telepathy-glib/dbus.c | 10 | ||||
| -rw-r--r-- | telepathy-glib/intset.c | 4 |
8 files changed, 31 insertions, 24 deletions
@@ -1,6 +1,11 @@ telepathy-glib 0.11.6 (UNRELEASED) ================================== +Requirements: + +* If gtk-doc is enabled, it must be version 1.15 or later. +* If GObject-Introspection is enabled, it must be version 0.6.11 or later. + Enhancements: * fd.o #20035: add TP_CONTACT_FEATURE_AVATAR_DATA, the ability to cache and @@ -29,6 +29,7 @@ Building telepathy-glib requires: Python <http://www.python.org/> and can also make use of: + GObject-Introspection <http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/> gtkdoc <http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/> See configure.ac for full details, including versions required. @@ -42,7 +43,7 @@ Bugs, feature requests and to-do list ===================================== Report all bugs, feature requests and "to-do" items here: - <https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=telepathy-glib> + <https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=tp-glib> Running "make check" will produce FIXME.out, which lists all the mentions of FIXME, TODO or XXX in the source code. Ideally, all of these should be in @@ -100,7 +101,8 @@ The current development version of telepathy-glib is available from the Stable branches are available from branches with names like 'telepathy-glib-0.6' in the same repository. -Proposed patches awaiting review can usually be found in Merge Monkey: - <http://monkey.collabora.co.uk/> +Proposed patches awaiting review can usually be found in freedesktop.org bugzilla. +Our review procedure is described by: + <http://telepathy.freedesktop.org/wiki/Review%20Procedure> Please follow <http://telepathy.freedesktop.org/wiki/Style>. diff --git a/configure.ac b/configure.ac index 1d4bca01..fe65a080 100644 --- a/configure.ac +++ b/configure.ac @@ -57,8 +57,8 @@ AM_PROG_MKDIR_P # pkg-config 0.21 adds CFLAGS from Requires.private, which we need PKG_PROG_PKG_CONFIG([0.21]) -GOBJECT_INTROSPECTION_CHECK([0.6.4]) -GTK_DOC_CHECK([1.14]) +GOBJECT_INTROSPECTION_CHECK([0.6.11]) +GTK_DOC_CHECK([1.15]) LT_CURRENT=tp_glib_lt_current LT_REVISION=tp_glib_lt_revision diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c index 420a0a68..d5bdb95d 100644 --- a/telepathy-glib/account.c +++ b/telepathy-glib/account.c @@ -2372,8 +2372,8 @@ tp_account_get_avatar_async (TpAccount *account, * * Finishes an async get operation of @account's avatar. * - * Returns: a #GArray of #guchar containing the bytes of the account's avatar, - * or %NULL on failure + * Returns: (element-type uint8): a #GArray of #guchar + * containing the bytes of the account's avatar, or %NULL on failure * * Since: 0.9.0 */ diff --git a/telepathy-glib/channel.c b/telepathy-glib/channel.c index 0c90428f..edf1d00f 100644 --- a/telepathy-glib/channel.c +++ b/telepathy-glib/channel.c @@ -1630,14 +1630,14 @@ tp_channel_class_init (TpChannelClass *klass) /** * TpChannel::group-members-changed-detailed: * @self: a channel - * @added: (type GLib.Array): a #GArray of #guint containing the full - * members added - * @removed: (type GLib.Array): a #GArray of #guint containing the members - * (full, local-pending or remote-pending) removed - * @local_pending: (type GLib.Array): a #GArray of #guint containing the - * local-pending members added - * @remote_pending: (type GLib.Array): a #GArray of #guint containing the - * remote-pending members added + * @added: (type GLib.Array) (element-type uint): a #GArray of #guint + * containing the full members added + * @removed: (type GLib.Array) (element-type uint): a #GArray of #guint + * containing the members (full, local-pending or remote-pending) removed + * @local_pending: (type GLib.Array) (element-type uint): a #GArray of + * #guint containing the local-pending members added + * @remote_pending: (type GLib.Array) (element-type uint): a #GArray of + * #guint containing the remote-pending members added * @details: (type GLib.HashTable): (element-type utf8 GObject.Value): * a #GHashTable mapping (gchar *) to #GValue containing details * about the change, as described in the specification of the diff --git a/telepathy-glib/connection-handles.c b/telepathy-glib/connection-handles.c index c5584d0f..006d307c 100644 --- a/telepathy-glib/connection-handles.c +++ b/telepathy-glib/connection-handles.c @@ -535,8 +535,8 @@ request_handles_context_free (gpointer p) * tp_connection_request_handles() * @n_handles: the number of IDs that were passed to * tp_connection_request_handles() on success, or 0 on failure - * @handles: (array length=n_handles): the @n_handles handles corresponding to - * @ids, in the same order, or %NULL on failure + * @handles: (element-type uint) (array length=n_handles): the @n_handles + * handles corresponding to @ids, in the same order, or %NULL on failure * @ids: a copy of the array of @n_handles IDs that was passed to * tp_connection_request_handles() on success, or %NULL on failure * @error: %NULL on success, or an error on failure diff --git a/telepathy-glib/dbus.c b/telepathy-glib/dbus.c index 2cf092ba..642f2c53 100644 --- a/telepathy-glib/dbus.c +++ b/telepathy-glib/dbus.c @@ -590,7 +590,7 @@ tp_dbus_check_valid_object_path (const gchar *path, GError **error) } /** - * tp_g_value_slice_new_bytes: + * tp_g_value_slice_new_bytes: (skip) * @length: number of bytes to copy * @bytes: location of an array of bytes to be copied (this may be %NULL * if and only if length is 0) @@ -621,7 +621,7 @@ tp_g_value_slice_new_bytes (guint length, } /** - * tp_g_value_slice_new_take_bytes: + * tp_g_value_slice_new_take_bytes: (skip) * @bytes: a non-NULL #GArray of guchar, ownership of which will be taken by * the #GValue * @@ -643,7 +643,7 @@ tp_g_value_slice_new_take_bytes (GArray *bytes) } /** - * tp_g_value_slice_new_object_path: + * tp_g_value_slice_new_object_path: (skip) * @path: a valid D-Bus object path which will be copied * * Slice-allocate a #GValue containing an object path, using @@ -663,7 +663,7 @@ tp_g_value_slice_new_object_path (const gchar *path) } /** - * tp_g_value_slice_new_static_object_path: + * tp_g_value_slice_new_static_object_path: (skip) * @path: a valid D-Bus object path which must remain valid forever * * Slice-allocate a #GValue containing an object path, using @@ -683,7 +683,7 @@ tp_g_value_slice_new_static_object_path (const gchar *path) } /** - * tp_g_value_slice_new_take_object_path: + * tp_g_value_slice_new_take_object_path: (skip) * @path: a valid D-Bus object path which will be freed with g_free() by the * returned #GValue (the caller must own it before calling this function, but * no longer owns it after this function returns) diff --git a/telepathy-glib/intset.c b/telepathy-glib/intset.c index 90c9ce88..7ffa0e24 100644 --- a/telepathy-glib/intset.c +++ b/telepathy-glib/intset.c @@ -385,7 +385,7 @@ addint (guint i, gpointer data) * * <!--Returns: says it all--> * - * Returns: a GArray of guint (which must be freed by the caller) containing + * Returns: (element-type uint): a GArray of guint (which must be freed by the caller) containing * the same integers as @set. */ GArray * @@ -405,7 +405,7 @@ tp_intset_to_array (const TpIntSet *set) /** * tp_intset_from_array: - * @array: An array of guint + * @array: (element-type uint): An array of guint * * <!--Returns: says it all--> * |