aboutsummaryrefslogtreecommitdiffstats
path: root/protocols/jabber
Commit message (Expand)AuthorAgeLines
* Restore support for joining password-protected Jabber rooms. Now using aWilmer van der Gaast2010-11-20-2/+16
* Change 704 introduced one tiny bug where a Jabber resource doesn't getWilmer van der Gaast2010-10-23-1/+2
* Another memory leak fix.Wilmer van der Gaast2010-10-21-1/+2
* Merging mainline, which includes a huge msnp13 merge.Wilmer van der Gaast2010-10-02-9/+9
|\
| * Fixing handling of (Jabber) chatroom topic changes done by the user.Wilmer van der Gaast2010-09-05-9/+9
* | Merge mainline stuff.Wilmer van der Gaast2010-08-31-8/+30
|\|
| * Suppress subjects in Jabber conversations after showing them once.Wilmer van der Gaast2010-08-31-1/+14
| * Use nifty gcc -MD feature to automatically track .h dependencies of all CWilmer van der Gaast2010-08-27-0/+3
| * Fix two compiler warnings.Wilmer van der Gaast2010-08-22-1/+1
| * Process incoming XMPP groupchat invites in a saner way: Create a temporaryWilmer van der Gaast2010-08-23-7/+9
| * Fixed a misuse of xt_find_node() that could get into an infinite loop.Wilmer van der Gaast2010-08-22-0/+4
* | First step in this merge. Mostly a bzr merge and then a cleanup of conflictsWilmer van der Gaast2010-08-24-0/+1
|\ \
| * \ merge with upstraem bitlbee 1.2.8Sven Moritz Hallberg2010-07-11-4/+36
| |\ \
| * \ \ merge in bitlbee headSven Moritz Hallberg2010-06-04-1/+0
| |\ \ \
| * \ \ \ merge in bitlbee 1.2.7Sven Moritz Hallberg2010-06-03-1/+3
| |\ \ \ \
| * \ \ \ \ merge in bitlbee 1.2.6Sven Moritz Hallberg2010-06-03-75/+63
| |\ \ \ \ \
| * \ \ \ \ \ merge in bitlbee 1.2.5Sven Moritz Hallberg2010-06-03-65/+64
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merge in bitlbee 1.2.4Sven Moritz Hallberg2010-06-03-10/+16
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ pretty blind try at merging in the latest trunkSven Moritz Hallberg2009-03-12-8/+10
| |\ \ \ \ \ \ \ \
| * | | | | | | | | commit updates by ashish shukla <wahjava@gmail.com>Sven Moritz Hallberg2009-03-12-3/+3
| * | | | | | | | | merge in latest trunkSven Moritz Hallberg2008-07-17-735/+110
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ more upstream changesSven Moritz Hallberg2008-02-17-1/+26
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ merge in upstream changesSven Moritz Hallberg2008-02-16-28/+85
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | - add support for setting ops/voice according to OTR msgstateSven Moritz Hallberg2008-02-09-0/+1
* | | | | | | | | | | | | Fix two compiler warnings.Wilmer van der Gaast2010-08-22-1/+1
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | Small bug in the previous change: NULL-initialize srv.Wilmer van der Gaast2010-08-11-1/+1
* | | | | | | | | | | | When doing SRV lookups, return an array with all RRs instead of just theWilmer van der Gaast2010-08-10-4/+14
* | | | | | | | | | | | OpenSolaris (non-gcc) fixes, patches from Dagobert Michelsen <dam@opencsw.org>Wilmer van der Gaast2010-08-07-6/+8
* | | | | | | | | | | | Take the local address from the IM/IRC connection when setting up a listeningWilmer van der Gaast2010-07-25-1/+1
* | | | | | | | | | | | Adding protocol-specific chatroom settings. First one to use this: AIMWilmer van der Gaast2010-07-24-1/+1
* | | | | | | | | | | | Fixed crash on failed Jabber file transfers.Wilmer van der Gaast2010-07-22-1/+0
* | | | | | | | | | | | Merging a few revisions from mainline.Wilmer van der Gaast2010-06-24-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Fixed an access-after-free() bug in the Jabber keepalive + cache cleanupWilmer van der Gaast2010-06-24-1/+2
| * | | | | | | | | | | Fixed a NULL pointer dereference in the Jabber module.Wilmer van der Gaast2010-06-23-1/+1
| * | | | | | | | | | | Added user_agent setting to Jabber accounts so people can get aroundWilmer van der Gaast2010-06-23-2/+4
* | | | | | | | | | | | Allow moving contacts around between groups. Works with at least Jabber,Wilmer van der Gaast2010-06-09-3/+5
* | | | | | | | | | | | Merging memory leak fixes from devel, time to find the ui-fix-specificWilmer van der Gaast2010-06-08-0/+29
|\| | | | | | | | | | |
| * | | | | | | | | | | Fixing some memory leakage.Wilmer van der Gaast2010-06-08-0/+29
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merging killerbee stuff, bringing all the bleeding-edge stuff together.Wilmer van der Gaast2010-06-07-10/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Merging mainline.Wilmer van der Gaast2010-06-06-1/+0
| |\| | | | | | | | | |
| * | | | | | | | | | | Merging libpurple branch into killerbee. It's fairly usable already, andWilmer van der Gaast2010-06-06-39/+21
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Allow one to run the configure script from a different directory and put allWilmer van der Gaast2010-05-25-1/+4
| | * | | | | | | | | | | Merging killerbee. (The non-libpurple stuff currently doesn't compile.)Wilmer van der Gaast2010-05-25-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | GAIM_INPUT_* were renamed, at last.Wilmer van der Gaast2010-05-25-7/+7
| | * | | | | | | | | | | | Mainline merge. (Probably mostly irrelevant for this branch, oh well.)Wilmer van der Gaast2010-05-16-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merging stuff from mainline (1.2.6).Wilmer van der Gaast2010-04-24-28/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merging in killerbee stuff (just file transfers and maybe a few things fromWilmer van der Gaast2010-03-21-24/+1972
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merging head. Most changes are not so relevant because they're to IMWilmer van der Gaast2010-03-20-65/+62
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merging in head.Wilmer van der Gaast2010-03-14-34/+40
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merging in mainline, including improved away/status stuff.Wilmer van der Gaast2010-03-07-21/+27
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \