There. BitlBee 3.0, it was about time. :-)

5 files changed, 33 insertions, 5 deletions

diff --git a/bitlbee.h b/bitlbee.h
index b8e55d05..394e33bf 100644
--- a/bitlbee.h
+++ b/bitlbee.h
@@ -34,10 +34,10 @@
 #define _WIN32_WINNT 0x0501
 
 #define PACKAGE "BitlBee"
-#define BITLBEE_VERSION "1.3dev"
+#define BITLBEE_VERSION "3.0"
 #define VERSION BITLBEE_VERSION
 #define BITLBEE_VER(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-#define BITLBEE_VERSION_CODE BITLBEE_VER(1, 3, 0)
+#define BITLBEE_VERSION_CODE BITLBEE_VER(3, 0, 0)
 
 #define MAX_STRING 511
 
diff --git a/doc/CHANGES b/doc/CHANGES
index 43345e98..37766721 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -3,7 +3,7 @@ found in the bzr commit logs, for example you can try:
 
 http://bugs.bitlbee.org/bitlbee/timeline?daysback=90&changeset=on
 
-Version 
+Version 3.0
 - Important: This version drops backward compatibility with the file format
   used for user settings in versions before 1.2. If you're upgrading from
   very old BitlBee versions (like 1.0.x), you'll have to recreate your
@@ -56,6 +56,11 @@ Version
     of that.
   * Support for sending offline messages.
   * Support for setting and reading status messages.
+- Integrated the bitlbee-otr branch in a mostly non-intrusive way. Since
+  this is not end-to-end it should *not* be enabled on public servers.
+  Distro packagers are requested to offer OTR as a separately installable
+  plugin. (Compile with --otr=plugin) Please do not enable it by default as
+  there is no easy way to disable OTR once the plugin is loaded/built in.
 - Support for file transfers, in and out. /DCC SEND a file to a contact and
   it becomes a file transfer, and incoming file transfers become /DCC SENDs
   to you. Note that this is mostly useful when combined with libpurple, as
@@ -73,7 +78,7 @@ Version
 - Many bug fixes in both the core and IM modules, small feature enhancements
   and other minor changes.
 
-Finished ...
+Finished 22 Oct 2010
 
 Version 1.2.8:
 - Now always using the AIM-style authentication method for OSCAR connections,
diff --git a/doc/comic_3.0.png b/doc/comic_3.0.png
new file mode 100644
index 00000000..f0fbc3ee
--- /dev/null
+++ b/doc/comic_3.0.png
diff --git a/doc/user-guide/misc.xml b/doc/user-guide/misc.xml
index bae8b9a8..1aceab56 100644
--- a/doc/user-guide/misc.xml
+++ b/doc/user-guide/misc.xml
@@ -300,6 +300,29 @@ Many more things, briefly described in <emphasis>help news1.3</emphasis>.
 </para>
 </sect1>
 
+<sect1 id="whatsnew030000">
+<title>New stuff in BitlBee 3.0</title>
+
+<para>
+BitlBee can be compiled with support for OTR message encryption (not available
+on public servers since encryption should be end-to-end).
+</para>
+
+<para>
+The MSN module was heavily updated to support features added to MSN Messenger
+over the recent years. You can now see/set status messages, send offline
+messages, and many strange issues caused by Microsoft breaking old-protocol
+compatibility should now be resolved.
+</para>
+
+<para>
+Twitter extended: IRC-style replies ("BitlBee:") now get converted to proper
+Twitter replies ("@BitlBee") and get a reference to the original message
+(see <emphasis>help set auto_reply_timeout</emphasis>). Retweets and some
+other stuff is also supported now (see <emphasis>help set commands</emphasis>).
+</para>
+</sect1>
+
 <sect1 id="news1.3">
 <title>New stuff in BitlBee 1.3dev (details)</title>
 
diff --git a/irc_send.c b/irc_send.c
index c992dae1..eb22139d 100644
--- a/irc_send.c
+++ b/irc_send.c
@@ -113,7 +113,7 @@ void irc_usermsg( irc_t *irc, char *format, ... )
 {
 	irc_channel_t *ic = NULL;
 	irc_user_t *iu = irc->root;
-	char text[1100];
+	char text[2048];
 	va_list params;
 	char *dst;