aboutsummaryrefslogtreecommitdiffstats
path: root/protocols/jabber
Commit message (Expand)AuthorAgeLines
...
| | * | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merging BitlBee 1.2.4+Wilmer van der Gaast2009-11-23-3/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Make purple use BitlBee's event handling API. Since the APIs never reallyWilmer van der Gaast2009-10-11-2/+2
* | | | | | | | | | | | | | | | | | | Pick up group changes in the middle of a Jabber session, now that we careWilmer van der Gaast2010-06-05-3/+2
* | | | | | | | | | | | | | | | | | | Merging head.Wilmer van der Gaast2010-06-01-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Don't whine on "incomplete" incoming IQ-set packets either, those also happen.Wilmer van der Gaast2010-05-23-1/+0
| | |_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Mainline merge.Wilmer van der Gaast2010-05-13-1/+3
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fixed a long-standing bug where non-anonymous Jabber chatrooms could causeWilmer van der Gaast2010-05-11-1/+3
| | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Use ?, not &&.Wilmer van der Gaast2010-05-13-1/+1
* | | | | | | | | | | | | | | | | Read group information from Jabber contact lists. The code was already there,Wilmer van der Gaast2010-05-09-1/+1
* | | | | | | | | | | | | | | | | Fixed buggy jabber_chat_by_jid() after GSList change.Wilmer van der Gaast2010-05-08-1/+1
* | | | | | | | | | | | | | | | | Misc. cleanup. Also updated the Yahoo! module to deal with struct groupchatWilmer van der Gaast2010-05-08-1/+0
* | | | | | | | | | | | | | | | | Starting to restore chatroom stuff. Only enough to create and be joinedWilmer van der Gaast2010-05-06-3/+7
* | | | | | | | | | | | | | | | | Merging loads of stuff from mainline.Wilmer van der Gaast2010-04-14-28/+5
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Added a mktime_utc() to misc.c using code that used to be in jabber_util.c.Wilmer van der Gaast2010-04-08-26/+3
| * | | | | | | | | | | | | | | | Suppress empty "Headline:" messages for certain new XMPP broadcast messages.Wilmer van der Gaast2010-03-29-2/+2
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merging a Jabber ft bugfix.Wilmer van der Gaast2010-04-11-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixing a bug in s5bytestream code to deal with incomplete SOCKS5 messagesWilmer van der Gaast2010-04-11-4/+5
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
* / | | | | | | | | | | | | | Including DCC stuff again, with a wonderful extra layer of abstraction.Wilmer van der Gaast2010-04-11-19/+19
|/ / / / / / / / / / / / / /
* | | | | | / / / / / / / / s/last_act/last_msg/ now.Wilmer van der Gaast2010-03-21-1/+1
| |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merging in file transfer support. Most important points from my reviewWilmer van der Gaast2010-03-21-24/+1972
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fixed jabber_bs_peek() to deal with incomplete packets as well.Wilmer van der Gaast2010-03-21-10/+21
| * | | | | | | | | | | | Killed the last str*cmp(xml_find_attr) combos.Wilmer van der Gaast2010-03-21-16/+26
| * | | | | | | | | | | | xt_status functions should always return an XT_ status, it's not a boolean.Wilmer van der Gaast2010-03-21-5/+5
| * | | | | | | | | | | | Read the from attribute from the main stanza, not the inside query. AlsoWilmer van der Gaast2010-03-21-2/+3
| * | | | | | | | | | | | Some compiler warning fixes and renamed "transfers" command to justWilmer van der Gaast2010-03-18-11/+12
| * | | | | | | | | | | | More small fixes. (NULL derefs and s/close/disconnect/)Wilmer van der Gaast2010-03-18-5/+8
| * | | | | | | | | | | | Ouch, committing stuff without even checking if it compiles is bad style.Wilmer van der Gaast2010-03-17-2/+2
| * | | | | | | | | | | | Avoid some NULL pointer dereferences on malformed XMPP packets.Wilmer van der Gaast2010-03-17-17/+24
| * | | | | | | | | | | | Small cleanup. The max_packet_size variable doesn't seem to be readWilmer van der Gaast2010-03-17-1/+1
| * | | | | | | | | | | | Merging mainline.Wilmer van der Gaast2010-03-17-64/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | No functional changes, just some style "fixes". Although I admit I'mWilmer van der Gaast2009-12-13-19/+27
| * | | | | | | | | | | | Merging head.Wilmer van der Gaast2009-12-07-22/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Added conf entries and lib/ftutil.[ch].ulim2008-08-12-71/+16
| * | | | | | | | | | | | merged in upstream r410.ulim2008-08-04-49/+94
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | moved some stuff around in preperation for MSN merge.ulim2008-08-04-22/+19
| * | | | | | | | | | | | Added an account setting 'proxy'.ulim2008-07-22-32/+93
| * | | | | | | | | | | | added a #define for AI_NUMERICSERV in s5bytestream.c (missing in ulibc).ulim2008-06-02-0/+4
| * | | | | | | | | | | | Added textual SOCKS5 error messages.ulim2008-06-02-2/+21
| * | | | | | | | | | | | some changes for sending.ulim2008-05-10-10/+102
| * | | | | | | | | | | | fix bug in new kb/s display for transfers of less than one second.ulim2008-05-07-1/+1
| * | | | | | | | | | | | timeout of transfers after 120 seconds of no progress (bytes received/sent).ulim2008-05-06-1/+2
| * | | | | | | | | | | | SOCKS5 bytestream related changes.ulim2008-05-06-4/+22
| * | | | | | | | | | | | ulibc support, fixes "Invalid SOCKS5 Connect message" problemulim2008-05-04-3/+18
| * | | | | | | | | | | | merged in upstream r379 (somewhere after 1.2-3).ulim2008-04-14-702/+63
| |\ \ \ \ \ \ \ \ \ \ \ \