delta/pidgin.git - keep.imfreedom.org: pidgin/pidgin

	Commit message (Collapse)	Author	Age	Files	Lines
*	propagate from branch 'im.pidgin.pidgin' (head ↵cpw.qulogic.msnp16	Jorge Villaseñor	2010-09-11	296	-10086/+6505
\|\ \| \| \| \| \| \| \| \| \| \|	3e676c22e294f13dae001ce73244b34bfec41c39) to branch 'im.pidgin.cpw.qulogic.msnp16' (head 5c9d3ec23a058643590d11b15d023fd656e4968e)
\| *	propagate from branch 'im.pidgin.cpw.sulabh.yahoo' (head ↵	Sulabh Mahajan	2010-09-10	1	-1/+8
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	d977db8fc273de40b6850909cfb8d4be5bc30559) to branch 'im.pidgin.pidgin' (head f9e2d52ffd77c066d47bd1d5ccc13c69584472f4)
\| \| *	propagate from branch 'im.pidgin.pidgin' (head ↵	Sulabh Mahajan	2010-09-09	22	-337/+663
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	7f64e8f873d421ee58f7cffe8ca9bfbb1e028c59) to branch 'im.pidgin.cpw.sulabh.yahoo' (head f4dda55ea733ca2118d9c8d7752ca7b4e0c0967a)
\| \| * \|	Fix file transfers. yahoo_get_cookies() doesn't seem to be working. As a	Sulabh Mahajan	2010-09-01	1	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix construct cookie by printing individual cookies together.
\| * \| \|	Remove the last traces of the standalone IdleTracker	Daniel Atallah	2010-09-10	1	-3/+0
\| \| \|/ \| \|/\|
\| * \|	merge of '78ab117f59e3a948986321c0e431792b48d77414'	Marcus Lundblad	2010-09-06	5	-5/+37
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	and 'f1f99de61e13c9a0d91a2842596b09471d0d8681'
\| \| * \|	Updated German translation:	Bj?rn Voigt	2010-09-06	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- missing comma
\| \| * \|	merge of '36d0c7b75f7affa61d2568d886efb02dbc364bc2'	Paul Aurich	2010-09-06	1	-0/+3
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and 'e1ebc9a8d7af1cdafed804d6fe0b37f291514304'
\| \| \| * \	merge of '5a5136914b3b94199850a338c9e99af2f03c2c40'	Elliott Sales de Andrade	2010-09-05	5	-6/+15
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and '7b0121a454cd005f1c2275aaa405a31cc7ff8517'
\| \| \| * \| \|	Auto-parent the Plugins dialog.	Gabriel Schulhof	2010-09-03	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #12404. committer: Elliott Sales de Andrade <qulogic@pidgin.im>
\| \| * \| \| \|	perl: Wrap purple_chat_get_components	Paul Aurich	2010-09-06	2	-0/+23
\| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	perl: Fix chat-related functions.	Paul Aurich	2010-09-05	3	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Purple::BuddyList::Chat::new needs to copy the strings, since the GHashTable is long-listing. The serv_join_chat wrapper needs to free the hash table, since that one isn't owned by the prpl.
\| * \| \| \|	ChangeLog the Google relay stuffcpw.malu.xmpp.google_relay	Marcus Lundblad	2010-09-06	1	-0/+2
\| \| \| \| \|
\| * \| \| \|	Added comment about including the relay token twice in the HTTP request	Marcus Lundblad	2010-09-06	1	-0/+2
\| \| \| \| \|
\| * \| \| \|	restore the Jingle method selection to prefer standard over Google-specific	Marcus Lundblad	2010-09-06	1	-8/+4
\| \| \| \| \|
\| * \| \| \|	added new files for Google relay-related functions	Marcus Lundblad	2010-09-05	2	-0/+182
\| \| \| \| \|
\| * \| \| \|	refactor out the relay credential fetching code to its own module	Marcus Lundblad	2010-09-05	3	-127/+15
\| \| \| \| \|
\| * \| \| \|	propagate from branch 'im.pidgin.pidgin' (head ↵	Marcus Lundblad	2010-09-04	10	-124/+468
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ca36f52b5f7708d25f5cc37ae4b3c3434c96f1cd) to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head 530a74a5b97eae06424cb3bcc13ec44057703b57)
\| \| * \| \|	propagate from branch 'im.pidgin.pidgin' (head ↵	Marcus Lundblad	2010-09-04	6	-207/+86
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4f357819d93b8c787ce2f9a6ffaee96b709c1935) to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head cc32a6a56c13ee1d447fe8fb1c4b1f7985c8bbe5)
\| \| * \| \| \|	Actually handle candidates we receive from the initiator before setting up ↵	Marcus Lundblad	2010-09-02	1	-16/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	our own streams (after getting a relay response from the HTTP server). This seems to somewhat work now, though for some reason it seems to use relays also locally...
\| \| * \| \| \|	Now it compiles again...	Marcus Lundblad	2010-09-01	3	-83/+270
\| \| \| \| \| \|
\| \| * \| \| \|	propagate from branch 'im.pidgin.pidgin' (head ↵	Marcus Lundblad	2010-09-01	1	-0/+1
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	00eda6a032b56f0002ca1f3c2035c8c76ea9f3dc) to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head 9d5a0d01b4435d85168c8fc3bab4b9b8ef95f56b)
\| \| * \ \ \ \	propagate from branch 'im.pidgin.pidgin' (head ↵	Marcus Lundblad	2010-09-01	7	-25/+137
\| \| \|\ \ \ \ \ \| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ab4878fc3483f1c61996f0e8b5cebd0bf13dcbbd) to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head 70a66a8a7a1f79c28cb36d191f011e2b2f7bcf25)
\| \| \| * \| \| \|	propagate from branch 'im.pidgin.pidgin' (head ↵	Marcus Lundblad	2010-03-10	71	-19070/+813
\| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	086222a6249c21b8f579bd2d4da01fe9e786c595) to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head c6506568957dc388d8d0978e78de414c78a73e4c)
\| \| \| * \ \ \ \	propagate from branch 'im.pidgin.pidgin' (head ↵	Marcus Lundblad	2010-03-09	211	-5801/+11074
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	5684cbe452f79eb2b96f221d37c1f83383b60514) to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head 602dc4de31cfe20c2a03b7552a02e1c6578f49e3)
\| \| \| * \| \| \| \| \|	Make the check for PRPL-supplied TURN parameters in the new place	Marcus Lundblad	2010-02-18	1	-1/+13
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Merge fix.	Marcus Lundblad	2010-02-18	1	-14/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There is still a change lost that should be re-introduced in libpurple/media
\| \| \| * \| \| \| \| \|	propagate from branch 'im.pidgin.pidgin' (head ↵	Marcus Lundblad	2010-02-18	248	-16580/+9093
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	770b86501b614dbcd9bd0d7ebbe55f21446d4dc1) to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head 96f7045b630e5f3cc254c1e2a21f59305a57cfd1)
\| \| \| * \ \ \ \ \ \	merge of 'dac1cbec5a2f1a9adcccc8434d7cb34940eb013e'	Marcus Lundblad	2010-02-14	2	-8/+18
\| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and '349422de6fe0ebebd57d42348cb9eac04bc0f926'
\| \| \| \| * \| \| \| \| \| \|	Fix merge and a compilation error	Marcus Lundblad	2010-02-14	3	-9/+19
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	propagate from branch 'im.pidgin.pidgin' (head ↵	Marcus Lundblad	2010-02-14	8	-118/+412
\| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bc88c5d2f146bd46a6e675226c126552b9dafcfb) to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head 3ed1483e856c94707c57bc6d90d7c136a7b9f913)
\| \| \| \| * \| \| \| \| \| \|	merge of '5fa668c7ddb65065ea1afeb56be6cccb2befe64b'	Marcus Lundblad	2010-01-08	60	-277/+696
\| \| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and 'b4510e67882785743ccca0da06834ebe905226fe'
\| \| \| \| \| * \ \ \ \ \ \	propagate from branch 'im.pidgin.pidgin' (head ↵	Marcus Lundblad	2010-01-08	60	-277/+696
\| \| \| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1e232732a9f31f155cd1b160e3af9723b583c040) to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head faac2ea3e3ecd8aab0d87d7d899b1036bc115970)
\| \| \| \| * \| \| \| \| \| \| \| \|	Some merge-resolving...	Marcus Lundblad	2010-01-08	1	-5/+1
\| \| \| \| \|/ / / / / / / /
\| \| \| \| * \| \| \| \| \| \| \|	propagate from branch 'im.pidgin.pidgin' (head ↵	Marcus Lundblad	2009-12-10	8	-105/+403
\| \| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	8d6805679729619a77939eadb060ca9682d35fb9) to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head 131f66d844dc8fb07e38ea62da2cfa1a185467a4)
\| \| \| \| \| * \ \ \ \ \ \ \	propagate from branch 'im.pidgin.pidgin' (head ↵	Marcus Lundblad	2009-12-06	8	-105/+403
\| \| \| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	aa5f5f35a8623c467e518ebe8d27c03ae7dfb3e3) to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head 94ef289c55877a23b6fb11adfff448bcc02b9234)
\| \| \| \| \| \| * \| \| \| \| \| \| \|	Fixup namespaces stuff after merge	Marcus Lundblad	2009-11-29	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \| \| \| \|	propagate from branch 'im.pidgin.pidgin' (head ↵	Marcus Lundblad	2009-11-29	8	-105/+403
\| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ac6acf2722f309aeb9182beddbee5d96caf7ee6a) to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head 80d34d015bb23ca238ccb775a4f31f770c393097)
\| \| \| \| \| \| \| * \ \ \ \ \ \ \	propagate from branch 'im.pidgin.pidgin' (head ↵	Marcus Lundblad	2009-11-23	134	-12936/+64811
\| \| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4fbd469968ef009ad354bc8b9ead8be785702974) to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head e13e4928977052f43e31947b9c3836e31e37a415)
\| \| \| \| \| \| \| * \ \ \ \ \ \ \ \	merge of '11123464441f3f8314ef91a143f9c1a853c231e1'	Marcus Lundblad	2009-11-09	167	-3407/+14672
\| \| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and '54f3151459432309ef06705f4046e90475440c3f'
\| \| \| \| \| \| \| \| * \ \ \ \ \ \ \ \	propagate from branch 'im.pidgin.pidgin' (head ↵	Marcus Lundblad	2009-11-09	71	-217/+11509
\| \| \| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	73294309bfa212c063e47d579eb8ce5c66ece6d2) to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head b97a0cc0c2f0aed2b22628f0c6116ff6a37a3057)
\| \| \| \| \| \| \| \| * \ \ \ \ \ \ \ \ \	propagate from branch 'im.pidgin.pidgin' (head ↵	Marcus Lundblad	2009-11-03	8	-105/+400
\| \| \| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a724c42684d3302f25f34e2b26034480f50aac6c) to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head 405e99540ff174f37a2bb55520f5ee7ab49ca311)
\| \| \| \| \| \| \| \| \| * \ \ \ \ \ \ \ \ \	propagate from branch 'im.pidgin.pidgin' (head ↵	Marcus Lundblad	2009-10-20	8	-105/+400
\| \| \| \| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	d14fe5e97aa7bb40c45790be3a86f5e72814d88e) to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head 0e06c97202e94d307d0bccb2c60bc2a80f2b4472)
\| \| \| \| \| \| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Use Google mode also for video when on a Google connection and the receiver	Marcus Lundblad	2009-11-09	1	-3/+5
\| \| \| \| \| \| \| \| \|_\|/ / / / / / / / / / \| \| \| \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	has the right caps. Only prefer Google Jingle over standard Jingle when we have received a Google relay token (I'm not sure if it could ever happen that there won't be one when on a Google connection, and we did the google:jingleinfo query...)
\| \| \| \| \| \| \| * \| \| \| \| \| \| \| \| \| \| \|	Keep track of more than one relay request at a time (this is probably not	Marcus Lundblad	2009-09-30	3	-13/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	likely to happen, but you never know...)
\| \| \| \| \| \| \| * \| \| \| \| \| \| \| \| \| \| \|	Reduce the debug noise a bit, since we print out the relay HTTP response	Marcus Lundblad	2009-09-30	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	anyway...
\| \| \| \| \| \| \| * \| \| \| \| \| \| \| \| \| \| \|	Rearranged some code to remove some duplication.	Marcus Lundblad	2009-09-28	1	-45/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Oh, and for some reason the three relayed candidates (udp, tcp and ssltcp port 443) are created as identical entries as the udp one, not sure why yet...
\| \| \| \| \| \| \| * \| \| \| \| \| \| \| \| \| \| \|	propagate from branch 'im.pidgin.pidgin' (head ↵	Marcus Lundblad	2009-09-28	8	-108/+389
\| \| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	f6efb49aa83803cf04bfe3ec09e4066de2bebf46) to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head 3f2c959e511cca756ee7b853a0085a020015e278)
\| \| \| \| \| \| \| \| * \| \| \| \| \| \| \| \| \| \| \|	Cancel ongoing Google relay request when signing out	Marcus Lundblad	2009-09-27	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \| \| \| \| \| \| \| \| \| \|	The receiver can now generate relayed candidates	Marcus Lundblad	2009-09-26	1	-63/+109
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|