diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-03-31 17:42:45 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-03-31 17:42:45 +0100 |
| commit | 041b1971ec5b2e0b01036747990ef40b3b9b69eb (patch) | |
| tree | aec7494e23ef7f4d7dc7affad7a231230f22a6d7 | |
| parent | 1a173e10bc4a86b7fdcdc9bbb71ec061aebc14fe (diff) | |
| parent | a3e12d60e406d75ba073c879c8f8b343eacfa9fc (diff) | |
Merge branch 'telepathy-glib-0.10'
Conflicts:
NEWS
| -rw-r--r-- | NEWS | 7 | ||||
| -rw-r--r-- | telepathy-glib/message-mixin.c | 4 |
2 files changed, 10 insertions, 1 deletions
@@ -20,6 +20,13 @@ Enhancements: * Add tp_value_array_unpack, the inverse of tp_value_array_build (danni) +Fixes: + +* tp_account_set_nickname_async: set the right source_tag (cassidy) + +* fd.o #27281: clarify documentation for tp_message_mixin_sent, using + telepathy-spec 0.19.2 as a reference (Maiku) + telepathy-glib 0.10.2 (2010-03-31) ================================== diff --git a/telepathy-glib/message-mixin.c b/telepathy-glib/message-mixin.c index 3a925da30..c6a22248c 100644 --- a/telepathy-glib/message-mixin.c +++ b/telepathy-glib/message-mixin.c @@ -1638,7 +1638,9 @@ struct _TpMessageMixinOutgoingMessagePrivate { * @error: %NULL on success, or the error with which message submission failed * * Indicate to the message mixin that message submission to the IM server has - * succeeded or failed. + * succeeded or failed. This should be called as soon as the CM determines + * it's theoretically possible to send the message (e.g. the parameters are + * supported and correct). * * After this function is called, @message will have been freed, and must not * be dereferenced. |