changeset 21031:afb4704781ed

merge of '74f5f273ea24887c8df0384ce8795613dfbbd7ee' and 'df5eddde2a5d7ede22d8136c865b525bf6c0c677'
author Will Thompson <will.thompson@collabora.co.uk>
date Sat, 27 Oct 2007 17:47:48 +0000
parents 42ecde230f91 (diff) 3cc856ca2338 (current diff)
children acbbcf6b6b46 9347a942b7cd ec9c30ce628d
files
diffstat 2 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/conversation.h	Sat Oct 27 13:56:54 2007 +0000
+++ b/libpurple/conversation.h	Sat Oct 27 17:47:48 2007 +0000
@@ -171,9 +171,12 @@
 	void (*write_im)(PurpleConversation *conv, const char *who,
 	                 const char *message, PurpleMessageFlags flags,
 	                 time_t mtime);
-	/** Write a message to a conversation.  This is used rather than
-	 *  the chat- or im-specific ops for generic messages, such as system
-	 *  messages like "x is now know as y".
+	/** Write a message to a conversation.  This is used rather than the
+	 *  chat- or im-specific ops for errors, system messages (such as "x is
+	 *  now know as y"), and as the fallback if #write_im and #write_chat
+	 *  are not implemented.  It should be implemented, or the UI will miss
+	 *  conversation error messages and your users will hate you.
+	 *
 	 *  @see purple_conversation_write()
 	 */
 	void (*write_conv)(PurpleConversation *conv,
--- a/libpurple/prpl.h	Sat Oct 27 13:56:54 2007 +0000
+++ b/libpurple/prpl.h	Sat Oct 27 17:47:48 2007 +0000
@@ -354,6 +354,11 @@
 	gboolean (*can_receive_file)(PurpleConnection *, const char *who);
 	void (*send_file)(PurpleConnection *, const char *who, const char *filename);
 	PurpleXfer *(*new_xfer)(PurpleConnection *, const char *who);
+
+	/** Checks whether offline messages to @a buddy are supported.
+	 *  @return @c TRUE if @a buddy can be sent messages while they are
+	 *          offline, or @c FALSE if not.
+	 */
 	gboolean (*offline_message)(const PurpleBuddy *buddy);
 
 	PurpleWhiteboardPrplOps *whiteboard_prpl_ops;