#
# ChangeLog for protocols/jabber
#
# Generated by Trac 1.2.3
# 2025-03-10T20:04:33Z

Mon, 26 Dec 2011 18:56:10 GMT Wilmer van der Gaast <wilmer@…> [f1849a8]
	* protocols/jabber/jabber_util.c (modified)

	jabber_buddy_* stuff *is* a complete memory management hell already. ...


Mon, 26 Dec 2011 10:50:34 GMT Wilmer van der Gaast <wilmer@…> [644b808]
	* lib/oauth2.c (modified)
	* protocols/jabber/sasl.c (modified)
	* root_commands.c (modified)

	A few more minor cleanups before merging this into mainline.


Sat, 24 Dec 2011 18:09:05 GMT Wilmer van der Gaast <wilmer@…> [34ded90]
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/jabber/sasl.c (modified)

	Slight cleanup: Use a constant instead of just "jabber_oauth" ...


Sat, 24 Dec 2011 18:02:39 GMT Wilmer van der Gaast <wilmer@…> [164352e]
	* bitlbee.conf (modified)
	* bitlbee.h (modified)
	* conf.c (modified)
	* conf.h (modified)
	* configure (modified)
	* debian/changelog (modified)
	* debian/control (modified)
	* debian/rules (modified)
	* doc/user-guide/commands.xml (modified)
	* irc.h (modified)
	* lib/events_glib.c (modified)
	* lib/http_client.c (modified)
	* lib/ssl_bogus.c (modified)
	* lib/ssl_client.h (modified)
	* lib/ssl_gnutls.c (modified)
	* lib/ssl_nss.c (modified)
	* lib/ssl_openssl.c (modified)
	* protocols/bee.h (modified)
	* protocols/jabber/io.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/msn/soap.c (modified)
	* protocols/skype/skype.c (modified)
	* unix.c (modified)

	Merging mainline.


Sat, 24 Dec 2011 17:49:12 GMT Wilmer van der Gaast <wilmer@…> [96f954d]
	* protocols/jabber/io.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)

	Removing unfinished debugging stuff accidentally committed in ...


Fri, 23 Dec 2011 12:44:08 GMT Wilmer van der Gaast <wilmer@…> [792a93b]
	* bitlbee.conf (modified)
	* conf.c (modified)
	* conf.h (modified)
	* doc/user-guide/commands.xml (modified)
	* lib/http_client.c (modified)
	* lib/ssl_bogus.c (modified)
	* lib/ssl_client.h (modified)
	* lib/ssl_gnutls.c (modified)
	* lib/ssl_nss.c (modified)
	* lib/ssl_openssl.c (modified)
	* protocols/jabber/io.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/msn/soap.c (modified)
	* protocols/skype/skype.c (modified)

	Merging SSL certificate verification for GnuTLS, with help from
	AopicieR.


Thu, 22 Dec 2011 11:23:18 GMT Wilmer van der Gaast <wilmer@…> [ad46e4d]
	* protocols/jabber/io.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* unix.c (modified)

	Use initgroups() as well when dropping privileges. Closes bug #852.


Wed, 21 Dec 2011 11:21:04 GMT Wilmer van der Gaast <wilmer@…> [ce199b7]
	* protocols/jabber/jabber.c (modified)
	* protocols/twitter/twitter.c (modified)
	* root_commands.c (modified)
	* set.c (modified)
	* set.h (modified)

	Make it easier to add OAuth-authenticated accounts without having to ...


Wed, 21 Dec 2011 10:48:08 GMT Wilmer van der Gaast <wilmer@…> [e14b47b8]
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/jabber/sasl.c (modified)

	Fix parsing of acc->pass. Use oauth_params_ functions instead of ...


Tue, 20 Dec 2011 16:45:53 GMT Wilmer van der Gaast <wilmer@…> [68286eb]
	* protocols/jabber/conference.c (modified)
	* protocols/jabber/iq.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/jabber/jabber_util.c (modified)

	Detect JID changes at login time and warn the user about them.


Mon, 19 Dec 2011 18:45:53 GMT Wilmer van der Gaast <wilmer@…> [41658da]
	* protocols/jabber/io.c (modified)

	Just check if verification code != 0 instead of checking for one ...


Mon, 19 Dec 2011 17:57:20 GMT Wilmer van der Gaast <wilmer@…> [a72dc2b]
	* lib/http_client.c (modified)
	* lib/ssl_bogus.c (modified)
	* lib/ssl_client.h (modified)
	* lib/ssl_gnutls.c (modified)
	* lib/ssl_nss.c (modified)
	* lib/ssl_openssl.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/skype/skype.c (modified)

	Add verify argument to ssl_connect() so HTTPS-based stuff is also ...


Mon, 19 Dec 2011 17:22:37 GMT Wilmer van der Gaast <wilmer@…> [78b8401]
	* lib/ssl_bogus.c (modified)
	* lib/ssl_client.h (modified)
	* lib/ssl_gnutls.c (modified)
	* lib/ssl_nss.c (modified)
	* lib/ssl_openssl.c (modified)
	* protocols/jabber/io.c (modified)

	Move conversion of status codes to status messages into SSL libs.


Mon, 19 Dec 2011 14:50:58 GMT Wilmer van der Gaast <wilmer@…> [486ddb5]
	* conf.c (modified)
	* conf.h (modified)
	* lib/http_client.c (modified)
	* lib/ssl_bogus.c (modified)
	* lib/ssl_client.h (modified)
	* lib/ssl_gnutls.c (modified)
	* lib/ssl_nss.c (modified)
	* lib/ssl_openssl.c (modified)
	* protocols/jabber/io.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/skype/skype.c (modified)

	Initial merge of tls_verify patch from AopicieR.


Mon, 19 Dec 2011 12:54:49 GMT Wilmer van der Gaast <wilmer@…> [36533bf]
	* lib/oauth.h (modified)
	* protocols/jabber/sasl.c (modified)

	When updating the XMPP password field with OAuth data, try harder to ...


Mon, 19 Dec 2011 00:41:40 GMT Wilmer van der Gaast <wilmer@…> [4be0e34]
	* lib/oauth.c (modified)
	* protocols/jabber/sasl.c (modified)

	Give a list of SASL mechanisms supported by a server when reporting ...


Sun, 18 Dec 2011 21:56:44 GMT Wilmer van der Gaast <wilmer@…> [64b6635]
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/jabber/sasl.c (modified)

	Restructured and updated code a little bit to support new-style (much ...


Sun, 18 Dec 2011 19:25:44 GMT Wilmer van der Gaast <wilmer@…> [18c6d36]
	* lib/oauth2.c (modified)
	* lib/oauth2.h (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/jabber/sasl.c (modified)

	More generic OAuth support now. Should work well for all GTalk ...


Sat, 17 Dec 2011 13:50:01 GMT Wilmer van der Gaast <wilmer@…> [6e9ae72]
	* Makefile (modified)
	* bitlbee.h (modified)
	* configure (modified)
	* debian/bitlbee-plugin-skype.docs (added)
	* debian/changelog (modified)
	* debian/control (modified)
	* debian/rules (modified)
	* debian/skyped.README.Debian (added)
	* debian/skyped.docs (added)
	* doc/CHANGES (modified)
	* doc/user-guide/commands.xml (modified)
	* doc/user-guide/help.xsl (modified)
	* doc/user-guide/misc.xml (modified)
	* doc/user-guide/quickstart.xml (modified)
	* ipc.c (modified)
	* irc.c (modified)
	* irc.h (modified)
	* irc_commands.c (modified)
	* irc_im.c (modified)
	* irc_send.c (modified)
	* lib/http_client.c (modified)
	* lib/ssl_client.h (modified)
	* lib/ssl_gnutls.c (modified)
	* lib/ssl_nss.c (modified)
	* lib/ssl_openssl.c (modified)
	* lib/xmltree.c (modified)
	* nick.c (modified)
	* otr.c (modified)
	* protocols/jabber/io.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/s5bytestream.c (modified)
	* protocols/msn/ns.c (modified)
	* protocols/msn/sb.c (modified)
	* protocols/msn/soap.c (modified)
	* protocols/nogaim.c (modified)
	* protocols/oscar/chat.c (modified)
	* protocols/oscar/chatnav.c (modified)
	* protocols/oscar/icq.c (modified)
	* protocols/oscar/im.c (modified)
	* protocols/oscar/misc.c (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/oscar/rxqueue.c (modified)
	* protocols/oscar/service.c (modified)
	* protocols/purple/purple.c (modified)
	* protocols/skype/.bzrignore (added)
	* protocols/skype/.mailmap (added)
	* protocols/skype/HACKING (added)
	* protocols/skype/Makefile (added)
	* protocols/skype/NEWS (added)
	* protocols/skype/README (added)
	* protocols/skype/asciidoc.conf (added)
	* protocols/skype/client.sh (added)
	* protocols/skype/skype.c (added)
	* protocols/skype/skyped.cnf (added)
	* protocols/skype/skyped.conf.dist (added)
	* protocols/skype/skyped.py (added)
	* protocols/skype/skyped.txt (added)
	* protocols/skype/t/Makefile (added)
	* protocols/skype/t/bitlbee.conf (added)
	* protocols/skype/t/irssi/livetest-irssi.sh (added)
	* protocols/skype/t/irssi/skype-call.test (added)
	* protocols/skype/t/irssi/skype-info.test (added)
	* protocols/skype/t/irssi/skype-login.test (added)
	* protocols/skype/t/irssi/skype-msg.test (added)
	* protocols/skype/t/irssi/trigger.pl (added)
	* protocols/skype/t/livetest-bitlbee.sh (added)
	* protocols/twitter/twitter.c (modified)
	* protocols/twitter/twitter.h (modified)
	* protocols/twitter/twitter_lib.c (modified)
	* protocols/twitter/twitter_lib.h (modified)
	* protocols/yahoo/libyahoo2.c (modified)
	* query.c (modified)
	* root_commands.c (modified)
	* set.c (modified)
	* set.h (modified)
	* storage_xml.c (modified)

	Mainline merge.


Wed, 07 Dec 2011 21:47:25 GMT Wilmer van der Gaast <wilmer@…> [06b5893]
	* protocols/jabber/io.c (modified)
	* protocols/jabber/jabber.c (modified)
	* root_commands.c (modified)
	* set.c (modified)
	* set.h (modified)

	Merging non-SASL authentication patch from #863. This also implements ...


Sun, 30 Oct 2011 11:33:49 GMT Wilmer van der Gaast <wilmer@…> [de26f3c]
	* protocols/jabber/s5bytestream.c (modified)

	Killed careless use of strcpy(). Luckily these are only a risk on ...


Thu, 04 Aug 2011 15:19:54 GMT Wilmer van der Gaast <wilmer@…> [911d97a]
	* irc_im.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/sasl.c (modified)

	Error handling fixes.

	Found one double free() bug causing troubles ...


Sun, 31 Jul 2011 20:31:37 GMT Wilmer van der Gaast <wilmer@…> [f988ad3]
	* protocols/jabber/jabber.c (modified)

	Don't timeout Jabber connections on OAuth initialization.


Sun, 31 Jul 2011 20:27:30 GMT Wilmer van der Gaast <wilmer@…> [f138bd2]
	* lib/oauth.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/sasl.c (modified)

	OAuth code cleanup.


Sun, 31 Jul 2011 15:44:37 GMT Wilmer van der Gaast <wilmer@…> [e1c926f]
	* lib/md5.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/jabber/sasl.c (modified)

	Facebook authentication. This isn't really OAuth in the end: FB ...


Tue, 26 Jul 2011 11:58:38 GMT Wilmer van der Gaast <wilmer@…> [4a5d885]
	* lib/oauth.h (modified)
	* lib/oauth2.c (modified)
	* lib/oauth2.h (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/jabber/sasl.c (modified)

	Working OAuth2 support. Needs some more debugging (error handling is ...


Mon, 25 Jul 2011 12:09:30 GMT Wilmer van der Gaast <wilmer@…> [59c9adb4]
	* protocols/jabber/jabber.c (modified)

	Kill obsolete Jabber server string (SSL, port#s, etc) parsing.


Fri, 22 Jul 2011 18:29:25 GMT Wilmer van der Gaast <wilmer@…> [57b4525]
	* lib/Makefile (modified)
	* lib/oauth2.c (added)
	* lib/oauth2.h (added)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/sasl.c (modified)

	Nothing useful yet, this just generates an auth URL. Things to do: ...


Thu, 24 Feb 2011 19:47:50 GMT Wilmer van der Gaast <wilmer@…> [8e3890b]
	* protocols/bee_user.c (modified)
	* protocols/jabber/io.c (modified)

	Fix memory corruption on Jabber disconnect with xmlconsole and ...


Thu, 16 Dec 2010 21:02:16 GMT Wilmer van der Gaast <wilmer@…> [fe79f7a7]
	* protocols/jabber/io.c (modified)

	Hide password information during SASL auth in xmlconsole.


Tue, 07 Dec 2010 23:14:30 GMT Wilmer van der Gaast <wilmer@…> [a97a336]
	* irc_im.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/twitter/twitter.c (modified)

	Add CTCP HELP code. Also cleaning up some noop handlers in the ...


Mon, 06 Dec 2010 00:18:27 GMT Wilmer van der Gaast <wilmer@…> [d76e12f]
	* protocols/jabber/iq.c (modified)
	* protocols/jabber/jabber.h (modified)

	Add support for XEP 202 (replacement for jabber:iq:time).


Mon, 06 Dec 2010 00:03:49 GMT Wilmer van der Gaast <wilmer@…> [d88c92a]
	* irc_im.c (modified)
	* protocols/bee.h (modified)
	* protocols/bee_user.c (modified)
	* protocols/jabber/iq.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/nogaim.h (modified)

	First bits of CTCP support to contacts. (Try /CTCP VERSION on a ...


Sat, 20 Nov 2010 11:48:04 GMT Wilmer van der Gaast <wilmer@…> [6d544a1]
	* protocols/jabber/jabber.c (modified)

	Restore support for joining password-protected Jabber rooms. Now ...


Fri, 22 Oct 2010 23:46:44 GMT Wilmer van der Gaast <wilmer@…> [03e6c52]
	* protocols/jabber/jabber_util.c (modified)

	Change 704 introduced one tiny bug where a Jabber resource doesn't ...


Thu, 21 Oct 2010 00:11:02 GMT Wilmer van der Gaast <wilmer@…> [79b5c41]
	* protocols/jabber/jabber_util.c (modified)

	Another memory leak fix.


Sun, 03 Oct 2010 02:45:26 GMT Wilmer van der Gaast <wilmer@…> [8e9e2b7]
	* bitlbee.c (modified)
	* bitlbee.h (modified)
	* configure (modified)
	* doc/CHANGES (modified)
	* doc/FAQ (modified)
	* doc/README (modified)
	* doc/user-guide/commands.xml (modified)
	* doc/user-guide/misc.xml (modified)
	* help.c (modified)
	* help.h (modified)
	* irc.c (modified)
	* irc_channel.c (modified)
	* irc_commands.c (modified)
	* irc_im.c (modified)
	* irc_send.c (modified)
	* lib/Makefile (modified)
	* lib/des.c (added)
	* lib/des.h (added)
	* lib/misc.c (modified)
	* lib/sha1.c (modified)
	* lib/sha1.h (modified)
	* lib/ssl_client.h (modified)
	* lib/ssl_gnutls.c (modified)
	* lib/ssl_openssl.c (modified)
	* lib/xmltree.c (modified)
	* lib/xmltree.h (modified)
	* protocols/bee.h (modified)
	* protocols/bee_chat.c (modified)
	* protocols/bee_user.c (modified)
	* protocols/jabber/conference.c (modified)
	* protocols/msn/Makefile (modified)
	* protocols/msn/msn.c (modified)
	* protocols/msn/msn.h (modified)
	* protocols/msn/msn_util.c (modified)
	* protocols/msn/ns.c (modified)
	* protocols/msn/passport.c (deleted)
	* protocols/msn/passport.h (deleted)
	* protocols/msn/sb.c (modified)
	* protocols/msn/soap.c (added)
	* protocols/msn/soap.h (added)
	* protocols/msn/tables.c (modified)
	* protocols/nogaim.c (modified)
	* protocols/nogaim.h (modified)
	* protocols/oscar/ssi.c (modified)
	* protocols/purple/purple.c (modified)
	* protocols/twitter/twitter.c (modified)
	* root_commands.c (modified)
	* storage_xml.c (modified)
	* unix.c (modified)

	Merging mainline, which includes a huge msnp13 merge.

	Not 100% sure ...


Sun, 05 Sep 2010 10:27:12 GMT Wilmer van der Gaast <wilmer@…> [41e0c00]
	* irc_im.c (modified)
	* protocols/jabber/conference.c (modified)

	Fixing handling of (Jabber) chatroom topic changes done by the user.


Tue, 31 Aug 2010 20:06:14 GMT Wilmer van der Gaast <wilmer@…> [f5c0d8e]
	* .bzrignore (modified)
	* Makefile (modified)
	* configure (modified)
	* doc/user-guide/commands.xml (modified)
	* irc.h (modified)
	* irc_commands.c (modified)
	* irc_im.c (modified)
	* irc_send.c (modified)
	* lib/Makefile (modified)
	* protocols/Makefile (modified)
	* protocols/bee.h (modified)
	* protocols/bee_chat.c (modified)
	* protocols/jabber/Makefile (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/jabber/message.c (modified)
	* protocols/jabber/si.c (modified)
	* protocols/msn/Makefile (modified)
	* protocols/oscar/Makefile (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/purple/Makefile (modified)
	* protocols/twitter/Makefile (modified)
	* protocols/twitter/twitter.c (modified)
	* protocols/yahoo/Makefile (modified)
	* protocols/yahoo/libyahoo2.c (modified)
	* root_commands.c (modified)
	* utils/README (modified)
	* utils/centericq2bitlbee.sh (deleted)
	* utils/convert_gnomeicu.txt (deleted)
	* utils/convert_purple.py (added)
	* utils/create_nicksfile.pl (deleted)

	Merge mainline stuff.


Mon, 30 Aug 2010 22:02:46 GMT Wilmer van der Gaast <wilmer@…> [31dbb90a]
	* protocols/jabber/jabber.h (modified)
	* protocols/jabber/message.c (modified)

	Suppress subjects in Jabber conversations after showing them once.


Fri, 27 Aug 2010 08:48:18 GMT Wilmer van der Gaast <wilmer@…> [b0a89cc]
	* .bzrignore (modified)
	* Makefile (modified)
	* configure (modified)
	* lib/Makefile (modified)
	* protocols/Makefile (modified)
	* protocols/jabber/Makefile (modified)
	* protocols/msn/Makefile (modified)
	* protocols/oscar/Makefile (modified)
	* protocols/purple/Makefile (modified)
	* protocols/twitter/Makefile (modified)
	* protocols/yahoo/Makefile (modified)

	Use nifty gcc -MD feature to automatically track .h dependencies of ...


Mon, 23 Aug 2010 23:12:24 GMT Wilmer van der Gaast <wilmer@…> [be999a5]
	* bitlbee.h (modified)
	* configure (modified)
	* doc/README (modified)
	* doc/user-guide/commands.xml (modified)
	* irc.h (modified)
	* lib/misc.c (modified)
	* lib/ssl_bogus.c (modified)
	* lib/ssl_client.h (modified)
	* lib/ssl_gnutls.c (modified)
	* lib/ssl_nss.c (modified)
	* lib/ssl_openssl.c (modified)
	* log.c (modified)
	* log.h (modified)
	* otr.c (added)
	* otr.h (added)
	* protocols/jabber/jabber.c (modified)
	* protocols/msn/msn.c (modified)
	* protocols/nogaim.h (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/twitter/twitter.c (modified)
	* protocols/yahoo/yahoo.c (modified)
	* query.c (modified)
	* root_commands.c (modified)
	* storage.c (modified)
	* unix.c (modified)

	First step in this merge. Mostly a bzr merge and then a cleanup of ...


Sun, 22 Aug 2010 08:07:48 GMT Wilmer van der Gaast <wilmer@…> [bd599b9]
	* protocols/jabber/si.c (modified)
	* protocols/twitter/twitter_lib.c (modified)

	Fix two compiler warnings.


Mon, 23 Aug 2010 10:34:36 GMT Wilmer van der Gaast <wilmer@…> [1aa74f55]
	* irc.h (modified)
	* irc_im.c (modified)
	* irc_send.c (modified)
	* protocols/bee.h (modified)
	* protocols/bee_chat.c (modified)
	* protocols/jabber/message.c (modified)

	Process incoming XMPP groupchat invites in a saner way: Create a ...


Sun, 22 Aug 2010 12:15:53 GMT Wilmer van der Gaast <wilmer@…> [1bb1e01]
	* protocols/jabber/si.c (modified)

	Fixed a misuse of xt_find_node() that could get into an infinite
	loop.


Sun, 22 Aug 2010 08:07:48 GMT Wilmer van der Gaast <wilmer@…> [237eadd]
	* protocols/jabber/si.c (modified)
	* protocols/twitter/twitter_lib.c (modified)

	Fix two compiler warnings.


Wed, 11 Aug 2010 08:53:58 GMT Wilmer van der Gaast <wilmer@…> [72176c1]
	* protocols/jabber/jabber.c (modified)

	Small bug in the previous change: NULL-initialize srv.


Tue, 10 Aug 2010 11:18:09 GMT Wilmer van der Gaast <wilmer@…> [ffdf2e7]
	* lib/misc.c (modified)
	* lib/misc.h (modified)
	* protocols/jabber/jabber.c (modified)

	When doing SRV lookups, return an array with all RRs instead of just ...


Sat, 07 Aug 2010 16:33:02 GMT Wilmer van der Gaast <wilmer@…> [daae10f]
	* Makefile (modified)
	* conf.c (modified)
	* configure (modified)
	* irc_commands.c (modified)
	* lib/Makefile (modified)
	* lib/md5.h (modified)
	* lib/oauth.c (modified)
	* lib/sha1.h (modified)
	* lib/xmltree.c (modified)
	* protocols/Makefile (modified)
	* protocols/jabber/Makefile (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/message.c (modified)
	* protocols/msn/Makefile (modified)
	* protocols/msn/msn.c (modified)
	* protocols/nogaim.c (modified)
	* protocols/nogaim.h (modified)
	* protocols/oscar/Makefile (modified)
	* protocols/twitter/Makefile (modified)
	* protocols/twitter/twitter_lib.c (modified)
	* protocols/yahoo/Makefile (modified)
	* protocols/yahoo/libyahoo2.c (modified)
	* unix.c (modified)

	OpenSolaris (non-gcc) fixes, patches from Dagobert Michelsen ...


Sat, 24 Jul 2010 22:50:23 GMT Wilmer van der Gaast <wilmer@…> [f1f7b5e]
	* dcc.c (modified)
	* lib/ftutil.c (modified)
	* lib/ftutil.h (modified)
	* protocols/jabber/s5bytestream.c (modified)

	Take the local address from the IM/IRC connection when setting up a ...


Sat, 24 Jul 2010 14:06:22 GMT Wilmer van der Gaast <wilmer@…> [03f3828]
	* irc_im.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/nogaim.h (modified)
	* protocols/oscar/oscar.c (modified)

	Adding protocol-specific chatroom settings. First one to use this: ...


Thu, 22 Jul 2010 07:43:21 GMT Wilmer van der Gaast <wilmer@…> [938c305]
	* protocols/jabber/s5bytestream.c (modified)

	Fixed crash on failed Jabber file transfers.


Sun, 11 Jul 2010 17:21:21 GMT Sven Moritz Hallberg <pesco@…> [eb6df6a]
	* bitlbee.h (modified)
	* doc/CHANGES (modified)
	* doc/user-guide/commands.xml (modified)
	* protocols/jabber/iq.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/jabber/jabber_util.c (modified)
	* protocols/jabber/message.c (modified)
	* protocols/twitter/twitter.c (modified)
	* protocols/twitter/twitter.h (modified)
	* protocols/twitter/twitter_lib.c (modified)
	* protocols/twitter/twitter_lib.h (modified)
	* storage_xml.c (modified)

	merge with upstraem bitlbee 1.2.8


Thu, 24 Jun 2010 09:14:34 GMT Wilmer van der Gaast <wilmer@…> [8b8def58]
	* doc/user-guide/commands.xml (modified)
	* protocols/jabber/iq.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/message.c (modified)
	* protocols/twitter/twitter.c (modified)
	* protocols/twitter/twitter.h (modified)
	* protocols/twitter/twitter_lib.c (modified)

	Merging a few revisions from mainline.


Thu, 24 Jun 2010 01:06:49 GMT Wilmer van der Gaast <wilmer@…> [38ff846]
	* protocols/jabber/jabber.c (modified)

	Fixed an access-after-free() bug in the Jabber keepalive + cache ...


Wed, 23 Jun 2010 22:37:24 GMT Wilmer van der Gaast <wilmer@…> [90ba416]
	* protocols/jabber/message.c (modified)

	Fixed a NULL pointer dereference in the Jabber module.


Wed, 23 Jun 2010 00:13:46 GMT Wilmer van der Gaast <wilmer@…> [4eef271]
	* doc/user-guide/commands.xml (modified)
	* protocols/jabber/iq.c (modified)
	* protocols/jabber/jabber.c (modified)

	Added user_agent setting to Jabber accounts so people can get around ...


Tue, 08 Jun 2010 23:43:13 GMT Wilmer van der Gaast <wilmer@…> [46d215d]
	* irc_channel.c (modified)
	* irc_commands.c (modified)
	* protocols/jabber/iq.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* root_commands.c (modified)

	Allow moving contacts around between groups. Works with at least ...


Tue, 08 Jun 2010 22:22:16 GMT Wilmer van der Gaast <wilmer@…> [d50e22f]
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/jabber/jabber_util.c (modified)
	* protocols/twitter/twitter.c (modified)
	* storage_xml.c (modified)

	Merging memory leak fixes from devel, time to find the ui-fix- ...


Mon, 07 Jun 2010 23:04:58 GMT Wilmer van der Gaast <wilmer@…> [04a927c]
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/jabber/jabber_util.c (modified)
	* protocols/twitter/twitter.c (modified)

	Fixing some memory leakage.


Mon, 07 Jun 2010 14:31:07 GMT Wilmer van der Gaast <wilmer@…> [4aa0f6b]
	* Makefile (modified)
	* bitlbee.c (modified)
	* bitlbee.h (modified)
	* configure (modified)
	* dcc.c (modified)
	* debian/bitlbee-common.config (moved)
	* debian/bitlbee-common.docs (added)
	* debian/bitlbee-common.examples (added)
	* debian/bitlbee-common.templates (moved)
	* debian/bitlbee.init (modified)
	* debian/bitlbee.postinst (moved)
	* debian/bitlbee.postrm (moved)
	* debian/bitlbee.prerm (moved)
	* debian/changelog (modified)
	* debian/compat (added)
	* debian/conffiles (deleted)
	* debian/control (modified)
	* debian/patches/bitlbee.conf.diff (modified)
	* debian/po/POTFILES.in (modified)
	* debian/rules (modified)
	* doc/Makefile (modified)
	* doc/user-guide/Makefile (modified)
	* help.c (modified)
	* help.h (modified)
	* ipc.c (modified)
	* irc.c (modified)
	* lib/Makefile (modified)
	* lib/events.h (modified)
	* lib/events_glib.c (modified)
	* lib/events_libevent.c (modified)
	* lib/http_client.c (modified)
	* lib/proxy.c (modified)
	* lib/ssl_bogus.c (modified)
	* lib/ssl_client.h (modified)
	* lib/ssl_gnutls.c (modified)
	* lib/ssl_nss.c (modified)
	* lib/ssl_openssl.c (modified)
	* lib/ssl_sspi.c (modified)
	* protocols/Makefile (modified)
	* protocols/jabber/Makefile (modified)
	* protocols/jabber/io.c (modified)
	* protocols/jabber/s5bytestream.c (modified)
	* protocols/msn/Makefile (modified)
	* protocols/msn/invitation.c (modified)
	* protocols/msn/ns.c (modified)
	* protocols/msn/sb.c (modified)
	* protocols/nogaim.c (modified)
	* protocols/nogaim.h (modified)
	* protocols/oscar/Makefile (modified)
	* protocols/oscar/auth.c (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/purple/Makefile (added)
	* protocols/purple/ft-direct.c (added)
	* protocols/purple/ft.c (added)
	* protocols/purple/purple.c (added)
	* protocols/twitter/Makefile (modified)
	* protocols/yahoo/Makefile (modified)
	* protocols/yahoo/yahoo.c (modified)
	* set.c (modified)
	* set.h (modified)
	* tests/Makefile (modified)
	* unix.c (modified)

	Merging killerbee stuff, bringing all the bleeding-edge stuff
	together.


Sat, 05 Jun 2010 23:26:07 GMT Wilmer van der Gaast <wilmer@…> [1fdb0a4]
	* bitlbee.h (modified)
	* debian/changelog (modified)
	* debian/control (modified)
	* doc/CHANGES (modified)
	* doc/bitlbee.8 (modified)
	* doc/user-guide/commands.xml (modified)
	* doc/user-guide/quickstart.xml (modified)
	* irc_commands.c (modified)
	* lib/misc.c (modified)
	* protocols/jabber/iq.c (modified)
	* protocols/msn/passport.c (modified)
	* protocols/oscar/auth.c (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/twitter/twitter.c (modified)
	* protocols/twitter/twitter.h (modified)
	* protocols/twitter/twitter_http.c (modified)
	* protocols/twitter/twitter_http.h (modified)
	* protocols/twitter/twitter_lib.c (modified)
	* protocols/twitter/twitter_lib.h (modified)

	Merging mainline.


Sat, 05 Jun 2010 23:21:02 GMT Wilmer van der Gaast <wilmer@…> [b308cf9]
	* Makefile (modified)
	* bitlbee.c (modified)
	* bitlbee.h (modified)
	* conf.c (modified)
	* configure (modified)
	* dcc.c (modified)
	* debian/bitlbee-common.config (moved)
	* debian/bitlbee-common.docs (added)
	* debian/bitlbee-common.examples (added)
	* debian/bitlbee-common.templates (moved)
	* debian/bitlbee.init (modified)
	* debian/bitlbee.postinst (moved)
	* debian/bitlbee.postrm (moved)
	* debian/bitlbee.prerm (moved)
	* debian/changelog (modified)
	* debian/compat (added)
	* debian/conffiles (deleted)
	* debian/control (modified)
	* debian/patches/bitlbee.conf.diff (modified)
	* debian/po/POTFILES.in (modified)
	* debian/rules (modified)
	* doc/CHANGES (modified)
	* doc/Makefile (modified)
	* doc/user-guide/Makefile (modified)
	* doc/user-guide/commands.xml (modified)
	* help.c (modified)
	* help.h (modified)
	* ipc.c (modified)
	* irc.c (modified)
	* irc_commands.c (modified)
	* lib/Makefile (modified)
	* lib/events.h (modified)
	* lib/events_glib.c (modified)
	* lib/events_libevent.c (modified)
	* lib/http_client.c (modified)
	* lib/misc.c (modified)
	* lib/misc.h (modified)
	* lib/oauth.c (added)
	* lib/oauth.h (added)
	* lib/proxy.c (modified)
	* lib/ssl_bogus.c (modified)
	* lib/ssl_client.h (modified)
	* lib/ssl_gnutls.c (modified)
	* lib/ssl_nss.c (modified)
	* lib/ssl_openssl.c (modified)
	* lib/ssl_sspi.c (modified)
	* lib/url.c (modified)
	* lib/url.h (modified)
	* lib/xmltree.c (modified)
	* log.c (modified)
	* protocols/Makefile (modified)
	* protocols/jabber/Makefile (modified)
	* protocols/jabber/conference.c (modified)
	* protocols/jabber/io.c (modified)
	* protocols/jabber/jabber_util.c (modified)
	* protocols/jabber/message.c (modified)
	* protocols/jabber/s5bytestream.c (modified)
	* protocols/msn/Makefile (modified)
	* protocols/msn/invitation.c (modified)
	* protocols/msn/msn.c (modified)
	* protocols/msn/msn.h (modified)
	* protocols/msn/msn_util.c (modified)
	* protocols/msn/ns.c (modified)
	* protocols/msn/sb.c (modified)
	* protocols/nogaim.c (modified)
	* protocols/nogaim.h (modified)
	* protocols/oscar/Makefile (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/purple/Makefile (added)
	* protocols/purple/ft-direct.c (added)
	* protocols/purple/ft.c (added)
	* protocols/purple/purple.c (added)
	* protocols/twitter/Makefile (added)
	* protocols/twitter/twitter.c (added)
	* protocols/twitter/twitter.h (added)
	* protocols/twitter/twitter_http.c (added)
	* protocols/twitter/twitter_http.h (added)
	* protocols/twitter/twitter_lib.c (added)
	* protocols/twitter/twitter_lib.h (added)
	* protocols/yahoo/Makefile (modified)
	* protocols/yahoo/yahoo.c (modified)
	* set.c (modified)
	* set.h (modified)
	* storage_xml.c (modified)
	* tests/Makefile (modified)
	* unix.c (modified)

	Merging libpurple branch into killerbee. It's fairly usable already, ...


Sat, 05 Jun 2010 18:26:17 GMT Wilmer van der Gaast <wilmer@…> [f5d87ea]
	* protocols/jabber/iq.c (modified)

	Pick up group changes in the middle of a Jabber session, now that we ...


Thu, 03 Jun 2010 22:08:23 GMT Sven Moritz Hallberg <pesco@…> [3759849]
	* debian/changelog (modified)
	* debian/control (modified)
	* debian/rules (modified)
	* doc/bitlbee.8 (modified)
	* doc/user-guide/commands.xml (modified)
	* doc/user-guide/quickstart.xml (modified)
	* irc_commands.c (modified)
	* lib/misc.c (modified)
	* protocols/jabber/iq.c (modified)
	* protocols/oscar/auth.c (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/twitter/twitter.c (modified)
	* protocols/twitter/twitter.h (modified)
	* protocols/twitter/twitter_http.c (modified)
	* protocols/twitter/twitter_http.h (modified)
	* protocols/twitter/twitter_lib.c (modified)
	* protocols/twitter/twitter_lib.h (modified)

	merge in bitlbee head


Thu, 03 Jun 2010 21:13:57 GMT Sven Moritz Hallberg <pesco@…> [bb09b3c]
	* bitlbee.h (modified)
	* debian/changelog (modified)
	* debian/rules (modified)
	* doc/CHANGES (modified)
	* doc/user-guide/commands.xml (modified)
	* irc.c (modified)
	* lib/Makefile (modified)
	* lib/misc.c (modified)
	* lib/oauth.c (added)
	* lib/oauth.h (added)
	* lib/url.c (modified)
	* lib/url.h (modified)
	* lib/xmltree.c (modified)
	* protocols/jabber/conference.c (modified)
	* protocols/msn/passport.c (modified)
	* protocols/msn/sb.c (modified)
	* protocols/nogaim.c (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/twitter/twitter.c (modified)
	* protocols/twitter/twitter.h (modified)
	* protocols/twitter/twitter_http.c (modified)
	* protocols/twitter/twitter_http.h (modified)
	* protocols/twitter/twitter_lib.c (modified)
	* protocols/yahoo/yahoo.c (modified)

	merge in bitlbee 1.2.7


Thu, 03 Jun 2010 11:00:45 GMT Sven Moritz Hallberg <pesco@…> [814aa52]
	* Makefile (modified)
	* bitlbee.c (modified)
	* bitlbee.h (modified)
	* conf.c (modified)
	* configure (modified)
	* debian/bitlbee.init (modified)
	* debian/changelog (modified)
	* debian/config (modified)
	* debian/control (modified)
	* debian/patches/bitlbee.conf.diff (modified)
	* debian/po/POTFILES.in (modified)
	* debian/po/ru.po (added)
	* debian/postinst (modified)
	* debian/prerm (modified)
	* doc/CHANGES (modified)
	* doc/user-guide/commands.xml (modified)
	* irc.c (modified)
	* irc_commands.c (modified)
	* lib/misc.c (modified)
	* lib/misc.h (modified)
	* log.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/jabber/jabber_util.c (modified)
	* protocols/jabber/message.c (modified)
	* protocols/jabber/presence.c (modified)
	* protocols/msn/msn.c (modified)
	* protocols/msn/msn.h (modified)
	* protocols/msn/msn_util.c (modified)
	* protocols/msn/ns.c (modified)
	* protocols/msn/sb.c (modified)
	* protocols/nogaim.c (modified)
	* protocols/nogaim.h (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/twitter/Makefile (added)
	* protocols/twitter/twitter.c (added)
	* protocols/twitter/twitter.h (added)
	* protocols/twitter/twitter_http.c (added)
	* protocols/twitter/twitter_http.h (added)
	* protocols/twitter/twitter_lib.c (added)
	* protocols/twitter/twitter_lib.h (added)
	* root_commands.c (modified)
	* storage_xml.c (modified)
	* tests/check_jabber_util.c (modified)
	* unix.c (modified)

	merge in bitlbee 1.2.6


Thu, 03 Jun 2010 10:41:03 GMT Sven Moritz Hallberg <pesco@…> [5f8ab6a9]
	* Makefile (modified)
	* account.c (modified)
	* account.h (modified)
	* bitlbee.c (modified)
	* bitlbee.conf (modified)
	* bitlbee.h (modified)
	* chat.c (modified)
	* chat.h (modified)
	* conf.c (modified)
	* conf.h (modified)
	* configure (modified)
	* crypting.c (modified)
	* doc/CHANGES (modified)
	* doc/user-guide/commands.xml (modified)
	* doc/user-guide/misc.xml (modified)
	* irc.c (modified)
	* irc_commands.c (modified)
	* lib/misc.c (modified)
	* lib/misc.h (modified)
	* protocols/jabber/io.c (modified)
	* protocols/jabber/iq.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/jabber/jabber_util.c (modified)
	* protocols/jabber/presence.c (modified)
	* protocols/msn/msn.c (modified)
	* protocols/msn/msn.h (modified)
	* protocols/msn/msn_util.c (modified)
	* protocols/msn/ns.c (modified)
	* protocols/msn/tables.c (modified)
	* protocols/nogaim.c (modified)
	* protocols/nogaim.h (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/yahoo/libyahoo2.c (modified)
	* protocols/yahoo/yahoo.c (modified)
	* protocols/yahoo/yahoo2_types.h (modified)
	* root_commands.c (modified)
	* storage_xml.c (modified)
	* unix.c (modified)
	* user.h (modified)

	merge in bitlbee 1.2.5


Thu, 03 Jun 2010 10:31:46 GMT Sven Moritz Hallberg <pesco@…> [3f81999]
	* bitlbee.h (modified)
	* doc/CHANGES (modified)
	* doc/user-guide/commands.xml (modified)
	* irc_commands.c (modified)
	* lib/ini.c (modified)
	* protocols/jabber/conference.c (modified)
	* protocols/jabber/iq.c (modified)
	* protocols/nogaim.c (modified)
	* protocols/nogaim.h (modified)
	* protocols/oscar/aim.h (modified)
	* protocols/yahoo/libyahoo2.c (modified)
	* protocols/yahoo/yahoo.c (modified)
	* protocols/yahoo/yahoo2.h (modified)
	* protocols/yahoo/yahoo2_callbacks.h (modified)
	* protocols/yahoo/yahoo2_types.h (modified)
	* root_commands.c (modified)

	merge in bitlbee 1.2.4


Tue, 25 May 2010 22:26:54 GMT Wilmer van der Gaast <wilmer@…> [f60079b]
	* Makefile (modified)
	* bitlbee.h (modified)
	* configure (modified)
	* doc/Makefile (modified)
	* doc/user-guide/Makefile (modified)
	* lib/Makefile (modified)
	* protocols/Makefile (modified)
	* protocols/jabber/Makefile (modified)
	* protocols/msn/Makefile (modified)
	* protocols/oscar/Makefile (modified)
	* protocols/purple/Makefile (modified)
	* protocols/twitter/Makefile (modified)
	* protocols/yahoo/Makefile (modified)
	* tests/Makefile (modified)

	Allow one to run the configure script from a different directory and ...


Tue, 25 May 2010 22:07:06 GMT Wilmer van der Gaast <wilmer@…> [51a799e]
	* Makefile (modified)
	* configure (modified)
	* crypting.c (deleted)
	* crypting.h (deleted)
	* irc.c (modified)
	* protocols/jabber/si.c (modified)
	* root_commands.c (modified)
	* storage.c (modified)
	* storage_text.c (deleted)
	* win32.c (modified)

	Merging killerbee. (The non-libpurple stuff currently doesn't
	compile.)


Tue, 25 May 2010 22:04:55 GMT Wilmer van der Gaast <wilmer@…> [d25ebea]
	* protocols/jabber/s5bytestream.c (modified)
	* protocols/msn/invitation.c (modified)

	GAIM_INPUT_* were renamed, at last.


Sun, 23 May 2010 14:14:16 GMT Wilmer van der Gaast <wilmer@…> [186bd04]
	* protocols/jabber/iq.c (modified)

	Don't whine on "incomplete" incoming IQ-set packets either, those ...


Sat, 15 May 2010 23:28:16 GMT Wilmer van der Gaast <wilmer@…> [ec86b22]
	* doc/user-guide/commands.xml (modified)
	* irc.c (modified)
	* lib/Makefile (modified)
	* lib/misc.c (modified)
	* lib/oauth.c (added)
	* lib/oauth.h (added)
	* lib/url.c (modified)
	* lib/url.h (modified)
	* lib/xmltree.c (modified)
	* protocols/jabber/conference.c (modified)
	* protocols/msn/sb.c (modified)
	* protocols/nogaim.c (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/twitter/twitter.c (modified)
	* protocols/twitter/twitter.h (modified)
	* protocols/twitter/twitter_http.c (modified)
	* protocols/twitter/twitter_http.h (modified)
	* protocols/twitter/twitter_lib.c (modified)
	* protocols/yahoo/yahoo.c (modified)

	Mainline merge. (Probably mostly irrelevant for this branch, oh
	well.)


Tue, 01 Jun 2010 21:51:27 GMT Wilmer van der Gaast <wilmer@…> [704dd38]
	* bitlbee.h (modified)
	* debian/changelog (modified)
	* debian/control (modified)
	* debian/rules (modified)
	* doc/CHANGES (modified)
	* doc/bitlbee.8 (modified)
	* doc/user-guide/commands.xml (modified)
	* doc/user-guide/quickstart.xml (modified)
	* lib/misc.c (modified)
	* protocols/jabber/iq.c (modified)
	* protocols/msn/passport.c (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/twitter/twitter.c (modified)
	* protocols/twitter/twitter.h (modified)
	* protocols/twitter/twitter_http.c (modified)
	* protocols/twitter/twitter_http.h (modified)
	* protocols/twitter/twitter_lib.c (modified)
	* protocols/twitter/twitter_lib.h (modified)
	* protocols/yahoo/yahoo.c (modified)

	Merging head.


Thu, 13 May 2010 22:05:13 GMT Wilmer van der Gaast <wilmer@…> [3429b58]
	* lib/xmltree.c (modified)
	* protocols/jabber/conference.c (modified)
	* protocols/msn/sb.c (modified)
	* protocols/oscar/oscar.c (modified)

	Mainline merge.


Thu, 13 May 2010 00:30:36 GMT Wilmer van der Gaast <wilmer@…> [58f5ef7]
	* protocols/jabber/conference.c (modified)

	Use ?, not &&.


Mon, 10 May 2010 23:35:58 GMT Wilmer van der Gaast <wilmer@…> [e73a501]
	* protocols/jabber/conference.c (modified)

	Fixed a long-standing bug where non-anonymous Jabber chatrooms could ...


Sun, 09 May 2010 13:21:24 GMT Wilmer van der Gaast <wilmer@…> [dcd16c5]
	* protocols/jabber/iq.c (modified)

	Read group information from Jabber contact lists. The code was ...


Sat, 08 May 2010 14:58:32 GMT Wilmer van der Gaast <wilmer@…> [e685657]
	* protocols/jabber/conference.c (modified)

	Fixed buggy jabber_chat_by_jid() after GSList change.


Sat, 08 May 2010 14:48:38 GMT Wilmer van der Gaast <wilmer@…> [eaaa986]
	* irc.c (modified)
	* irc_commands.c (modified)
	* protocols/bee.h (modified)
	* protocols/bee_chat.c (modified)
	* protocols/jabber/presence.c (modified)
	* protocols/yahoo/yahoo.c (modified)

	Misc. cleanup. Also updated the Yahoo! module to deal with struct ...


Thu, 06 May 2010 00:28:56 GMT Wilmer van der Gaast <wilmer@…> [aea8b68]
	* irc.h (modified)
	* irc_im.c (modified)
	* protocols/Makefile (modified)
	* protocols/bee.c (modified)
	* protocols/bee.h (modified)
	* protocols/jabber/conference.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/presence.c (modified)
	* protocols/nogaim.c (modified)
	* protocols/nogaim.h (modified)

	Starting to restore chatroom stuff. Only enough to create and be ...


Sat, 24 Apr 2010 17:02:07 GMT Wilmer van der Gaast <wilmer@…> [ae3dc99]
	* Makefile (modified)
	* bitlbee.c (modified)
	* bitlbee.h (modified)
	* conf.c (modified)
	* configure (modified)
	* debian/bitlbee.init (modified)
	* debian/changelog (modified)
	* debian/rules (modified)
	* doc/CHANGES (modified)
	* doc/user-guide/commands.xml (modified)
	* irc.c (modified)
	* irc_commands.c (modified)
	* lib/misc.c (modified)
	* lib/misc.h (modified)
	* log.c (modified)
	* protocols/jabber/jabber_util.c (modified)
	* protocols/jabber/message.c (modified)
	* protocols/msn/msn.c (modified)
	* protocols/msn/msn.h (modified)
	* protocols/msn/msn_util.c (modified)
	* protocols/msn/ns.c (modified)
	* protocols/msn/sb.c (modified)
	* protocols/nogaim.c (modified)
	* protocols/nogaim.h (modified)
	* protocols/twitter/Makefile (added)
	* protocols/twitter/twitter.c (added)
	* protocols/twitter/twitter.h (added)
	* protocols/twitter/twitter_http.c (added)
	* protocols/twitter/twitter_http.h (added)
	* protocols/twitter/twitter_lib.c (added)
	* protocols/twitter/twitter_lib.h (added)
	* storage_xml.c (modified)
	* unix.c (modified)

	Merging stuff from mainline (1.2.6).


Wed, 14 Apr 2010 09:27:50 GMT Wilmer van der Gaast <wilmer@…> [21c87a7]
	* Makefile (modified)
	* bitlbee.c (modified)
	* bitlbee.h (modified)
	* conf.c (modified)
	* configure (modified)
	* doc/CHANGES (modified)
	* doc/user-guide/commands.xml (modified)
	* irc.c (modified)
	* irc.h (modified)
	* irc_im.c (modified)
	* irc_util.c (added)
	* lib/misc.c (modified)
	* lib/misc.h (modified)
	* log.c (modified)
	* protocols/jabber/jabber_util.c (modified)
	* protocols/jabber/message.c (modified)
	* protocols/msn/msn.c (modified)
	* protocols/msn/msn.h (modified)
	* protocols/msn/msn_util.c (modified)
	* protocols/msn/ns.c (modified)
	* protocols/nogaim.c (modified)
	* protocols/nogaim.h (modified)
	* protocols/twitter/Makefile (added)
	* protocols/twitter/twitter.c (added)
	* protocols/twitter/twitter.h (added)
	* protocols/twitter/twitter_http.c (added)
	* protocols/twitter/twitter_http.h (added)
	* protocols/twitter/twitter_lib.c (added)
	* protocols/twitter/twitter_lib.h (added)
	* storage_xml.c (modified)
	* unix.c (modified)

	Merging loads of stuff from mainline.


Sun, 11 Apr 2010 18:13:19 GMT Wilmer van der Gaast <wilmer@…> [a87e6ba]
	* protocols/jabber/s5bytestream.c (modified)

	Merging a Jabber ft bugfix.


Sun, 11 Apr 2010 18:12:25 GMT Wilmer van der Gaast <wilmer@…> [3ab1d31]
	* protocols/jabber/s5bytestream.c (modified)

	Fixing a bug in s5bytestream code to deal with incomplete SOCKS5 ...


Sun, 11 Apr 2010 14:37:06 GMT Wilmer van der Gaast <wilmer@…> [17a6ee9]
	* Makefile (modified)
	* dcc.c (modified)
	* dcc.h (modified)
	* irc_im.c (modified)
	* protocols/Makefile (modified)
	* protocols/bee.h (modified)
	* protocols/bee_ft.c (added)
	* protocols/ft.h (modified)
	* protocols/jabber/iq.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber_util.c (modified)
	* protocols/jabber/s5bytestream.c (modified)
	* protocols/jabber/si.c (modified)
	* protocols/msn/Makefile (modified)
	* protocols/msn/msn.c (modified)
	* protocols/msn/msn_util.c (modified)
	* protocols/msn/sb.c (modified)
	* protocols/nogaim.c (modified)

	Including DCC stuff again, with a wonderful extra layer of ...


Thu, 08 Apr 2010 00:27:42 GMT Wilmer van der Gaast <wilmer@…> [2e3a857]
	* lib/misc.c (modified)
	* lib/misc.h (modified)
	* protocols/jabber/jabber_util.c (modified)

	Added a mktime_utc() to misc.c using code that used to be in ...


Tue, 30 Mar 2010 00:26:11 GMT Wilmer van der Gaast <wilmer@…> [c4bc92a]
	* protocols/jabber/message.c (modified)

	Suppress empty "Headline:" messages for certain new XMPP broadcast ...


Sun, 21 Mar 2010 16:52:22 GMT Wilmer van der Gaast <wilmer@…> [1cc0df3]
	* protocols/jabber/si.c (modified)

	s/last_act/last_msg/ now.


Sun, 21 Mar 2010 16:17:24 GMT Wilmer van der Gaast <wilmer@…> [85693e6]
	* Makefile (modified)
	* conf.c (modified)
	* conf.h (modified)
	* dcc.c (added)
	* dcc.h (added)
	* doc/user-guide/commands.xml (modified)
	* irc.c (modified)
	* irc.h (modified)
	* lib/Makefile (modified)
	* lib/ftutil.c (added)
	* lib/ftutil.h (added)
	* protocols/ft.h (added)
	* protocols/jabber/Makefile (modified)
	* protocols/jabber/iq.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/jabber/jabber_util.c (modified)
	* protocols/jabber/s5bytestream.c (added)
	* protocols/jabber/si.c (added)
	* protocols/msn/Makefile (modified)
	* protocols/msn/invitation.c (added)
	* protocols/msn/invitation.h (added)
	* protocols/msn/msn.c (modified)
	* protocols/msn/msn.h (modified)
	* protocols/msn/sb.c (modified)
	* protocols/nogaim.h (modified)
	* protocols/oscar/oscar.c (modified)
	* root_commands.c (modified)

	Merging in killerbee stuff (just file transfers and maybe a few ...


Sun, 21 Mar 2010 16:06:31 GMT Wilmer van der Gaast <wilmer@…> [767a148]
	* Makefile (modified)
	* conf.c (modified)
	* conf.h (modified)
	* dcc.c (added)
	* dcc.h (added)
	* doc/user-guide/commands.xml (modified)
	* irc.c (modified)
	* irc.h (modified)
	* lib/Makefile (modified)
	* lib/ftutil.c (added)
	* lib/ftutil.h (added)
	* protocols/ft.h (added)
	* protocols/jabber/Makefile (modified)
	* protocols/jabber/iq.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/jabber/jabber_util.c (modified)
	* protocols/jabber/s5bytestream.c (added)
	* protocols/jabber/si.c (added)
	* protocols/msn/Makefile (modified)
	* protocols/msn/invitation.c (added)
	* protocols/msn/invitation.h (added)
	* protocols/msn/msn.c (modified)
	* protocols/msn/msn.h (modified)
	* protocols/msn/sb.c (modified)
	* protocols/nogaim.h (modified)
	* root_commands.c (modified)

	Merging in file transfer support. Most important points from my ...


Sun, 21 Mar 2010 15:56:59 GMT Wilmer van der Gaast <wilmer@…> [a81d679]
	* protocols/jabber/s5bytestream.c (modified)

	Fixed jabber_bs_peek() to deal with incomplete packets as well.


Sun, 21 Mar 2010 01:02:03 GMT Wilmer van der Gaast <wilmer@…> [aed152f]
	* protocols/jabber/iq.c (modified)
	* protocols/jabber/si.c (modified)

	Killed the last str*cmp(xml_find_attr) combos.


Sun, 21 Mar 2010 00:46:18 GMT Wilmer van der Gaast <wilmer@…> [54a2014]
	* protocols/jabber/iq.c (modified)

	xt_status functions should always return an XT_ status, it's not a ...


Sun, 21 Mar 2010 00:39:45 GMT Wilmer van der Gaast <wilmer@…> [699376f7]
	* protocols/jabber/iq.c (modified)
	* protocols/jabber/si.c (modified)

	Read the from attribute from the main stanza, not the inside query. ...


Sat, 20 Mar 2010 18:03:18 GMT Wilmer van der Gaast <wilmer@…> [81ee561]
	* bitlbee.c (modified)
	* bitlbee.h (modified)
	* configure (modified)
	* debian/bitlbee.init (modified)
	* debian/changelog (modified)
	* debian/config (modified)
	* debian/control (modified)
	* debian/patches/bitlbee.conf.diff (modified)
	* debian/po/POTFILES.in (modified)
	* debian/po/ru.po (added)
	* debian/postinst (modified)
	* debian/prerm (modified)
	* doc/CHANGES (modified)
	* doc/user-guide/commands.xml (modified)
	* irc.c (modified)
	* irc_commands.c (modified)
	* protocols/jabber/io.c (modified)
	* protocols/jabber/iq.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/jabber/jabber_util.c (modified)
	* protocols/jabber/message.c (modified)
	* protocols/jabber/presence.c (modified)
	* protocols/nogaim.c (modified)
	* protocols/yahoo/libyahoo2.c (modified)
	* protocols/yahoo/yahoo.c (modified)
	* root_commands.c (modified)
	* tests/check_jabber_util.c (modified)
	* user.h (modified)

	Merging head. Most changes are not so relevant because they're to IM ...


Thu, 18 Mar 2010 14:38:06 GMT Wilmer van der Gaast <wilmer@…> [638feab]
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/jabber/jabber_util.c (modified)
	* protocols/jabber/message.c (modified)
	* protocols/jabber/presence.c (modified)
	* tests/check_jabber_util.c (modified)

	Merging in Jabber resource selection fix. This adds the ...


Thu, 18 Mar 2010 11:22:17 GMT Wilmer van der Gaast <wilmer@…> [842cd8d]
	* protocols/jabber/jabber_util.c (modified)
	* tests/check_jabber_util.c (modified)

	Fixed a bug that caused full JIDs to get lost sometimes with the new ...


Thu, 18 Mar 2010 00:30:38 GMT Wilmer van der Gaast <wilmer@…> [b8a491d]
	* protocols/jabber/s5bytestream.c (modified)
	* protocols/jabber/si.c (modified)
	* root_commands.c (modified)

	Some compiler warning fixes and renamed "transfers" command to just ...