changeset 18033:c3eb94e69ae7

merge of '0ceb1d26408290a4660e032ad5018d22ab2b9dda' and 'e0ff4c4e349a40b70347b78319d6a5211af3178b'
author Stu Tomlinson <stu@nosnilmot.com>
date Sat, 02 Jun 2007 18:12:35 +0000
parents fbebe15c91a7 (current diff) 23a65f460e34 (diff)
children 2a6fb7c6d030
files pidgin/pixmaps/emotes/default/22/theme pidgin/pixmaps/emotes/none/theme
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog.API	Sat Jun 02 13:09:49 2007 +0000
+++ b/ChangeLog.API	Sat Jun 02 18:12:35 2007 +0000
@@ -13,6 +13,10 @@
 	* purple_timeout_add_seconds()
 	    Callers should prefer this to purple_timeout_add() for timers
 	    longer than 1 second away.  Be aware of the rounding, though.
+	* PURPLE_MESSAGE_NO_LINKIFY message flag to indicate that the message
+	  should not be auto-linkified
+	* OPT_PROTO_SLASH_COMMANDS_NATIVE protocol option to indicate that
+	  slash commands are "native" to the protocol
 
 version 2.0.0 (5/3/2007):
 	Please note all functions, defines, and data structures have been