Commit message (Collapse) | Author | Age | Lines | ||
---|---|---|---|---|---|
... | |||||
* | Don't initialize the twitter_connections list to NULL in twitter_init(). | Wilmer van der Gaast | 2010-10-15 | -4/+2 | |
| | | | | | | This fixes a weird bug where Twitter updates often stop after a while when running in daemon mode with multiple users connected. | ||||
* | Alas, commit 700 becomes a boring "Oops, --otr=0 still doesn't build without | Wilmer van der Gaast | 2010-10-10 | -1/+4 | |
| | | | | | | | libotr installed". Also, it appears that this code needs libotr 3.2.0 or higher, but I'm not adding a build-dep since that'll cause troubles on the build bot, people can just build with BITLBEE_OTR=0. | ||||
* | Merging OTR branch. It's more or less a plugin if you enable it, and | Wilmer van der Gaast | 2010-10-09 | -85/+2471 | |
|\ | | | | | | | | | otherwise a no-op. DO NOT INSTALL THIS ON PUBLIC SERVERS. | ||||
| * | Added Debian packaging for OTR plugin. It's built by default but this can | Wilmer van der Gaast | 2010-10-09 | -11/+26 | |
| | | | | | | | | | | be disabled by setting BITLBEE_OTR to 0 (or 1 to compile it into the binary). | ||||
| * | Merging smpq fix from pesco. | Wilmer van der Gaast | 2010-10-06 | -15/+29 | |
| |\ | |||||
| | * | q&a-style smp only affects trust on the asking side | Sven Moritz Hallberg | 2010-10-04 | -15/+29 | |
| | | | |||||
| * | | Make sure events_*.c are fully compatible to callers so plugins built for | Wilmer van der Gaast | 2010-10-02 | -8/+7 | |
| | | | | | | | | | | | | | | | a different flavour will still work. | ||||
| * | | At least for now, only enable OTR if the user specifically asks for it. | Wilmer van der Gaast | 2010-10-02 | -5/+8 | |
| | | | | | | | | | | | | | | | | | | Distros can now ship a bitlbee-plugin-otr package (that should work with both bitlbee and bitlbee-libpurple). | ||||
| * | | Merging mainline, which includes a huge msnp13 merge. | Wilmer van der Gaast | 2010-10-02 | -914/+3366 | |
| |\ \ | | |/ | |/| | | | | | | | | | | Not 100% sure about the OpenSSL merge, should double check that but I'm currently offline. | ||||
| * | | Merging some more fixes (dealing with incoming smpq stuff). | Wilmer van der Gaast | 2010-10-01 | -16/+30 | |
| |\ \ | |||||
| | * | | cosmetic: show smpq question in bold | Sven Moritz Hallberg | 2010-10-01 | -1/+1 | |
| | | | | |||||
| | * | | libotr forgets to set trust when responding to smpq | Sven Moritz Hallberg | 2010-10-01 | -9/+15 | |
| | | | | |||||
| | * | | explicitly handle cheating by smp opponent | Sven Moritz Hallberg | 2010-10-01 | -0/+8 | |
| | | | | |||||
| | * | | give smp/smpq command handler a better name | Sven Moritz Hallberg | 2010-10-01 | -4/+4 | |
| | | | | |||||
| | * | | clarify copyright | Sven Moritz Hallberg | 2010-10-01 | -2/+2 | |
| |/ / | |||||
| * | | Fix use of g_convert(), thanks to an anonymous person who opened #676. | Wilmer van der Gaast | 2010-09-29 | -2/+2 | |
| | | | |||||
| * | | Merging some fixes from pesco. Adds support for the SMP flavour used by Pidgin | Wilmer van der Gaast | 2010-09-29 | -48/+112 | |
| |\ \ | | | | | | | | | | | | | | | | | (otr smpq). | ||||
| | * | | bump copyright year to 2010 in the right place | Sven Moritz Hallberg | 2010-09-19 | -2/+2 | |
| | | | | |||||
| | * | | complain when trying smp without an otr channel | Sven Moritz Hallberg | 2010-09-19 | -3/+7 | |
| | | | | |||||
| | * | | cosmetics | Sven Moritz Hallberg | 2010-09-19 | -1/+1 | |
| | | | | |||||
| | * | | let 'otr smpq' only work for smp init, not reply | Sven Moritz Hallberg | 2010-09-19 | -16/+19 | |
| | | | | |||||
| | * | | help entry for 'otr smpq' | Sven Moritz Hallberg | 2010-09-19 | -0/+17 | |
| | | | | |||||
| | * | | add 'otr smpq' command for q&a-style smp authentication | Sven Moritz Hallberg | 2010-09-19 | -43/+67 | |
| | | | | |||||
| | * | | call storage_save before freeing plugins, avoids segfault in otr.c | Sven Moritz Hallberg | 2010-09-19 | -4/+4 | |
| | | | | |||||
| | * | | handle SMP1Q packets (smp init with question) | Sven Moritz Hallberg | 2010-09-19 | -0/+16 | |
| | | | | |||||
| * | | | Allow building OTR support as a plugin. Fairly simple, let's hope I can get | Wilmer van der Gaast | 2010-09-29 | -19/+33 | |
| |/ / | | | | | | | | | | | | | away with doing this without libtool (eep). | ||||
| * | | Load/save code. It'd be better if the OTR module would just save its info | Wilmer van der Gaast | 2010-09-01 | -0/+40 | |
| | | | | | | | | | | | | | | | | | | in BitlBee settings that automatically end up in the existing .xml files (or whatever storage is used), but I realise this is non-trivial. | ||||
| * | | Do encryption and decryption. Somehow SMP and other things aren't working | Wilmer van der Gaast | 2010-09-01 | -63/+102 | |
| | | | | | | | | | | | | | | | | | | so well yet, at least when testing with Pidgin on the other side. Not sure where the bug is. | ||||
| * | | Pluginify this thing a little bit. Not so much in the dynamically loadable | Wilmer van der Gaast | 2010-09-01 | -57/+108 | |
| | | | | | | | | | | | | | | | sense of the word, more in a way that core files don't have to include otr.h. | ||||
| * | | Merge mainline stuff. | Wilmer van der Gaast | 2010-08-31 | -386/+321 | |
| |\ \ | |||||
| * | | | Added root_command_add() and use it to create the "otr" command. | Wilmer van der Gaast | 2010-08-31 | -17/+53 | |
| | | | | |||||
| * | | | It compiles, including otr.c. Time to hook it up with the rest again. | Wilmer van der Gaast | 2010-08-26 | -180/+143 | |
| | | | | |||||
| * | | | First step in this merge. Mostly a bzr merge and then a cleanup of conflicts | Wilmer van der Gaast | 2010-08-24 | -35/+2170 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | and parts I want to/have to redo (because of ui-fix). | ||||
| | * \ \ | merge with upstraem bitlbee 1.2.8 | Sven Moritz Hallberg | 2010-07-11 | -52/+205 | |
| | |\ \ \ | |||||
| | * \ \ \ | merge in bitlbee head | Sven Moritz Hallberg | 2010-06-04 | -144/+198 | |
| | |\ \ \ \ | |||||
| | * | | | | | add an option to disable otr on twitter (and other unsuitable protocols) | Sven Moritz Hallberg | 2010-06-03 | -4/+21 | |
| | | | | | | | |||||
| | * | | | | | merge in bitlbee 1.2.7 | Sven Moritz Hallberg | 2010-06-03 | -220/+908 | |
| | |\ \ \ \ \ | |||||
| | * | | | | | | fix a double free | Sven Moritz Hallberg | 2010-06-03 | -2/+2 | |
| | | | | | | | | |||||
| | * | | | | | | merge in bitlbee 1.2.6 | Sven Moritz Hallberg | 2010-06-03 | -216/+2170 | |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | merge in bitlbee 1.2.5 | Sven Moritz Hallberg | 2010-06-03 | -660/+808 | |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | merge in bitlbee 1.2.4 | Sven Moritz Hallberg | 2010-06-03 | -92/+600 | |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | dont specify a background when coloring encrypted messages | Sven Moritz Hallberg | 2009-03-13 | -1/+8 | |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | pretty blind try at merging in the latest trunk | Sven Moritz Hallberg | 2009-03-12 | -360/+1008 | |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | commit updates by ashish shukla <wahjava@gmail.com> | Sven Moritz Hallberg | 2009-03-12 | -284/+445 | |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | local merge | Sven Moritz Hallberg | 2008-07-17 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | silence a warning | Sven Moritz Hallberg | 2008-03-22 | -1/+1 | |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | fix a syntax error in ssl_openssl.c | Sven Moritz Hallberg | 2008-03-22 | -1/+1 | |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | merge in latest trunk | Sven Moritz Hallberg | 2008-07-17 | -867/+2308 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | minor bugfixes | Sven Moritz Hallberg | 2008-07-16 | -2/+2 | |
| | | |/ / / / / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | fix "purple background" bug *sigh* :P | Sven Moritz Hallberg | 2008-02-18 | -1/+1 | |
| | | | | | | | | | | | | |