summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* ChangeLog the Google relay stuffcpw.malu.xmpp.google_relayMarcus Lundblad2010-09-061-0/+2
* Added comment about including the relay token twice in the HTTP requestMarcus Lundblad2010-09-061-0/+2
* restore the Jingle method selection to prefer standard over Google-specificMarcus Lundblad2010-09-061-8/+4
* added new files for Google relay-related functionsMarcus Lundblad2010-09-052-0/+182
* refactor out the relay credential fetching code to its own moduleMarcus Lundblad2010-09-053-127/+15
* propagate from branch 'im.pidgin.pidgin' (head ca36f52b5f7708d25f5cc37ae4b3c3...Marcus Lundblad2010-09-0410-124/+468
|\
| * propagate from branch 'im.pidgin.pidgin' (head 4f357819d93b8c787ce2f9a6ffaee9...Marcus Lundblad2010-09-046-207/+86
| |\
| * | Actually handle candidates we receive from the initiator before setting up ou...Marcus Lundblad2010-09-021-16/+61
| * | Now it compiles again...Marcus Lundblad2010-09-013-83/+270
| * | propagate from branch 'im.pidgin.pidgin' (head 00eda6a032b56f0002ca1f3c2035c8...Marcus Lundblad2010-09-011-0/+1
| |\ \
| * \ \ propagate from branch 'im.pidgin.pidgin' (head ab4878fc3483f1c61996f0e8b5cebd...Marcus Lundblad2010-09-017-25/+137
| |\ \ \
| | * \ \ propagate from branch 'im.pidgin.pidgin' (head 086222a6249c21b8f579bd2d4da01f...Marcus Lundblad2010-03-1071-19070/+813
| | |\ \ \
| | * \ \ \ propagate from branch 'im.pidgin.pidgin' (head 5684cbe452f79eb2b96f221d37c1f8...Marcus Lundblad2010-03-09211-5801/+11074
| | |\ \ \ \
| | * | | | | Make the check for PRPL-supplied TURN parameters in the new placeMarcus Lundblad2010-02-181-1/+13
| | * | | | | Merge fix.Marcus Lundblad2010-02-181-14/+1
| | * | | | | propagate from branch 'im.pidgin.pidgin' (head 770b86501b614dbcd9bd0d7ebbe55f...Marcus Lundblad2010-02-18248-16580/+9093
| | |\ \ \ \ \
| | * \ \ \ \ \ merge of 'dac1cbec5a2f1a9adcccc8434d7cb34940eb013e'Marcus Lundblad2010-02-142-8/+18
| | |\ \ \ \ \ \
| | | * | | | | | Fix merge and a compilation errorMarcus Lundblad2010-02-143-9/+19
| | * | | | | | | propagate from branch 'im.pidgin.pidgin' (head bc88c5d2f146bd46a6e675226c1265...Marcus Lundblad2010-02-148-118/+412
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | merge of '5fa668c7ddb65065ea1afeb56be6cccb2befe64b'Marcus Lundblad2010-01-0860-277/+696
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ propagate from branch 'im.pidgin.pidgin' (head 1e232732a9f31f155cd1b160e3af97...Marcus Lundblad2010-01-0860-277/+696
| | | | |\ \ \ \ \ \
| | | * | | | | | | | Some merge-resolving...Marcus Lundblad2010-01-081-5/+1
| | | |/ / / / / / /
| | | * | | | | | | propagate from branch 'im.pidgin.pidgin' (head 8d6805679729619a77939eadb060ca...Marcus Lundblad2009-12-108-105/+403
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ propagate from branch 'im.pidgin.pidgin' (head aa5f5f35a8623c467e518ebe8d27c0...Marcus Lundblad2009-12-068-105/+403
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Fixup namespaces stuff after mergeMarcus Lundblad2009-11-292-4/+4
| | | | | * | | | | | | propagate from branch 'im.pidgin.pidgin' (head ac6acf2722f309aeb9182beddbee5d...Marcus Lundblad2009-11-298-105/+403
| | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ propagate from branch 'im.pidgin.pidgin' (head 4fbd469968ef009ad354bc8b9ead8b...Marcus Lundblad2009-11-23134-12936/+64811
| | | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ merge of '11123464441f3f8314ef91a143f9c1a853c231e1'Marcus Lundblad2009-11-09167-3407/+14672
| | | | | | |\ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ propagate from branch 'im.pidgin.pidgin' (head 73294309bfa212c063e47d579eb8ce...Marcus Lundblad2009-11-0971-217/+11509
| | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ propagate from branch 'im.pidgin.pidgin' (head a724c42684d3302f25f34e2b260344...Marcus Lundblad2009-11-038-105/+400
| | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ propagate from branch 'im.pidgin.pidgin' (head d14fe5e97aa7bb40c45790be3a86f5...Marcus Lundblad2009-10-208-105/+400
| | | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | Use Google mode also for video when on a Google connection and the receiverMarcus Lundblad2009-11-091-3/+5
| | | | | | | |_|/ / / / / / / / / | | | | | | |/| | | | | | | | | |
| | | | | | * | | | | | | | | | | Keep track of more than one relay request at a time (this is probably notMarcus Lundblad2009-09-303-13/+42
| | | | | | * | | | | | | | | | | Reduce the debug noise a bit, since we print out the relay HTTP responseMarcus Lundblad2009-09-301-3/+0
| | | | | | * | | | | | | | | | | Rearranged some code to remove some duplication.Marcus Lundblad2009-09-281-45/+33
| | | | | | * | | | | | | | | | | propagate from branch 'im.pidgin.pidgin' (head f6efb49aa83803cf04bfe3ec09e406...Marcus Lundblad2009-09-288-108/+389
| | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | | Cancel ongoing Google relay request when signing outMarcus Lundblad2009-09-272-1/+7
| | | | | | | * | | | | | | | | | | The receiver can now generate relayed candidatesMarcus Lundblad2009-09-261-63/+109
| | | | | | | * | | | | | | | | | | Don't include relay-info in the stream params if the prpl has already set itMarcus Lundblad2009-09-251-3/+16
| | | | | | | * | | | | | | | | | | Can now generate a relayed candidate for the initiatorMarcus Lundblad2009-09-245-25/+165
| | | | | | | * | | | | | | | | | | Can now sucessfully request relay info through HTTPMarcus Lundblad2009-09-221-10/+12
| | | | | | | * | | | | | | | | | | Only revert to Google jingle if using a Google account (since that is whenMarcus Lundblad2009-09-211-2/+3
| | | | | | | * | | | | | | | | | | merge of 'b81b650a5dc75eaa42bfe7bbe36bb8a3e03b3946'Marcus Lundblad2009-09-21147-27220/+43633
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ propagate from branch 'im.pidgin.pidgin' (head a2dd00ce03eb55dcad9d4524c36656...Marcus Lundblad2009-09-20147-27220/+43633
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | | | | Always use Google jingle when the other end supports, will have to do thisMarcus Lundblad2009-09-211-5/+2
| | | | | | | |/ / / / / / / / / / / /
| | | | | | | * | | | | | | | | | | | Some unfinished code to take advantage of Google's relaysMarcus Lundblad2009-08-314-39/+115
* | | | | | | | | | | | | | | | | | | jabber: priority is called preference in Google modeMarcus Lundblad2010-09-041-2/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | jabber: set priority on remote candidates for Google-style vvMarcus Lundblad2010-09-041-3/+6
* | | | | | | | | | | | | | | | | | Fix connecting to Yahoo when a global proxy has been specified, but isStu Tomlinson2010-09-031-1/+1
* | | | | | | | | | | | | | | | | | merge of '6780237a96eeae80ce228502c6ab378052777367'Elliott Sales de Andrade2010-09-032-172/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \