summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* *** Plucked rev 63c43b450346f157d7702f474b8108490188b3d9 (nosnilmot@pidgin.im):v2.7.7release-2.7.7John Bailey2010-11-241-2/+2
| | | | Fix building RPMs with the correct SSL libraries
* NEWS and ChangeLog.API.John Bailey2010-11-242-0/+10
|
* This branch should be ready for release now.John Bailey2010-11-241-2/+2
|
* ChangeLog entries for what I've plucked. Some are better than what they ↵John Bailey2010-11-241-0/+16
| | | | were before.
* Apply my specific AIM login fix listed below to the 2.7.7 branch.John Bailey2010-11-242-1/+2
| | | | | *** Plucked rev b21beb71827799eec3525c256f12e609d91e6e4f (rekkanoryo@pidgin.im): Properly handle an AIM login server of login.messaging.aol.com. Fixes #12948.
* Apply Stu's specific certificate changes listed below to the 2.7.7 branch.John Bailey2010-11-242-16/+85
| | | | | | | | | | | | | | | | | | | | | | | *** Plucked rev 0be86888d82fc0d9bd61c1426b73e52196b35817 (nosnilmot@pidgin.im): NSS will not return invalid or irrelevant intermediate certificates that the server presented as part of the certificate chain. GnuTLS, however, will return them, which breaks our certificate validation when the server is mis-configured. This fixes our GnuTLS SSL plugin to discard any certificate (and subsequent certs) in the chain if it did not sign the previous certificate. This allows GnuTLS users to connect to omega.contacts.msn.com while it is still misconfigured. *** Plucked rev 44e2c86fa3250a09c12de48785f224c5244d4819 (nosnilmot@pidgin.im): Our certificate code is generally designed around no two CA certificates having the same DN. Unfortunately this breaks when have multiple distinct intermediate certificates with the same DN, such as when we want to validate against MSN intermediate CAs. This change allows us to verify against any one of multiple CA certificates with the same DN, instead of relying on a) luck from reading from disk in the \"right\" order or b) black magic from NSS reconstructing a valid chain on connection attempts after CA pool initialization is complete.
* Apply Mark's specific changes listed below to the 2.7.7 branch.John Bailey2010-11-243-8/+20
| | | | | | | | | | | | | | | | | | | | | | | *** Plucked rev 05ca7c0f8c782c05e9866a9ac6ccc03acc7d2c7f (markdoliner@pidgin.im): Close open requests related to this xfer when the request is canceled locally. For oscar this includes disconnecting when you have an incoming transfer request. Without this change Pidgin will crash if the user tries to interact with the dialog. This change fixes #11666. Now instead of crashing we'll leak. See the lengthy comment in the code if anyone wants to fix this. *** Plucked rev 089c261f1de00667abd623ce3c5b471e91b09016 (markdoliner@pidgin.im): I noticed a NULL printf crash from the first chunk of this change. In the second chunk I changed the code to match the error message from the first chunk. I prefer this message. *** Plucked rev 6e8da78b6e5ccdafa85c8afebff37e426d9a58d3 (markdoliner@pidgin.im): Move the call to flap_connection_schedule_destroy from oscar_chat_kill to oscar_chat_leave. This avoids having flap_connection_schedule_destroy called from purple_connerr, which itself is called by flap_connection_destroy_cb I'm hoping this change fixes #5927, the oscar crash when a flap connection is disconnected.
* Branch for 2.7.7.John Bailey2010-11-241-4/+4
|
* merge of '99a593a0819b562d803d1f963476a7cd0d4db7f7'v2.7.6Elliott Sales de Andrade2010-11-225-50/+9
|\ | | | | | | and 'f352f10d5755679039efdc7a5d3235afc9e142e2'
| * Sigh, so apparently, I broke receiving smileys with some over-zealousElliott Sales de Andrade2010-11-221-1/+6
| | | | | | | | free-ing of slpmsgs. Remind me not to work at 4AM again.
| * Fix the possible leak in the function that's actually used.Elliott Sales de Andrade2010-11-221-3/+3
| |
| * This function isn't used and I've been trying to find the bug in it.Elliott Sales de Andrade2010-11-222-45/+0
| | | | | | | | So I guess it needs to go!
| * Fix possible leak.Elliott Sales de Andrade2010-11-221-3/+3
| |
| * Oops, we shouldn't free the MsnMessage here, because it comes fromElliott Sales de Andrade2010-11-211-1/+0
| | | | | | | | outside this function.
* | pidgin: Remove a timeout when destroying this object to avoid a use-after-freeJakub Adam2010-11-212-0/+7
| | | | | | | | | | | | | | Patch from Jakub "haakon" Adam. Closes #12806 committer: Paul Aurich <darkrain42@pidgin.im>
* | ChangeLog updates, NEWS, and prep for release.John Bailey2010-11-214-6/+35
| |
* | Updated translations for the 2.7.6 release. Fixes #12855, #12859, #12883.John Bailey2010-11-2112-986/+1318
| | | | | | | | | | Fixes #12884, #12889, #12892, #12893, #12896, #12900, #12904, #12909, #12937. Fixes #12939.
* | merge of 'c2c21299d153c1e726c4830ec68a1eaf15a2ded0'Mark Doliner2010-11-2114-141/+164
|\ \ | |/ | | | | and '7fb6119e2d38fab9782a59db9a82f5c4381eb0d6'
| * merge of '4be6d38f76328cc60820f9f476b3dce525dfe7af'Elliott Sales de Andrade2010-11-212-131/+135
| |\ | | | | | | | | | and '9e8bfd01f6bf370428fc76ce972b77c066ef3efc'
| | * merge of '11e15a7377382cff39897d6d5eb044d9adac7cb5'Mark Doliner2010-11-211-131/+133
| | |\ | | | | | | | | | | | | and '0ef538545fa65e641f48396997a91c22a5c1a4d8'
| | | * Hungarian translation updated for 2.7.6Kelemen G?bor2010-11-211-131/+133
| | | |
| * | | It looks like this account proxy info is leaked, too.Elliott Sales de Andrade2010-11-211-0/+3
| | | |
| * | | Fix a lot more leaks, some old, some new.Elliott Sales de Andrade2010-11-2110-7/+16
| | | |
| * | | Fix some leaks. Header and footer are allocated, copied and not freed.Elliott Sales de Andrade2010-11-212-0/+6
| | | |
| * | | Prevent a use-after-free. The timeout_cb may free the MsnTransaction,Elliott Sales de Andrade2010-11-211-1/+2
| | | | | | | | | | | | | | | | so we can't use it after that.
| * | | Don't attempt to process zero-length DC messages. We should probablyElliott Sales de Andrade2010-11-211-2/+4
| | |/ | |/| | | | | | | | | | | | | just use these for acking or something. Fixes #12660.
* | | Add comments for translatorsMark Doliner2010-11-211-1/+16
| |/ |/|
* | Changelog that commitPaul Aurich2010-11-201-0/+2
|/
* merge of 'aacaa228480c4129f2a8b1ef2a70285027b542c0'Paul Aurich2010-11-201-1/+1
|\ | | | | | | and '116e599c707fc47729211140c6596a57a74d5101'
| * jabber: Print out plaintext-equivalent passwords when PURPLE_UNSAFE_DEBUG is ↵Paul Aurich2010-11-201-1/+1
| | | | | | | | | | | | set. Refs #a14565.
* | Catalan translation updated.Josep Puigdemont2010-11-201-82/+104
|/
* Add new intermediate certificates that Microsoft have started using toStu Tomlinson2010-11-184-0/+69
| | | | | | | | sign the SSL cert for omega.contacts.msn.com, because their server admins are incompetent and are still supplying the old intermediates on the wire. References #12906
* German translation updateBj?rn Voigt2010-11-171-14/+17
|
* Encryption keys were marked with the _N() translation macroBj?rn Voigt2010-11-171-1/+1
| | | | | (e.g. N_("Use encryption if available")), but keys were not translated with the _() macro.
* ChangeLogMarcus Lundblad2010-11-151-0/+1
|
* Don't call purple_xfer_error before purple_xfer_cancel_remote when an error ↵Marcus Lundblad2010-11-151-17/+0
| | | | occurs in IBB, avoids double transfer messages on error. Closes #12757
* update for German translation, still incompleteJochen Kemnade2010-11-151-26/+55
|
* Make 'intltool-update --maintain' happy.John Bailey2010-11-131-0/+1
|
* Minor cleanup. Should be no functionality change, just a variableMark Doliner2010-11-101-14/+11
| | | | | rename (tmp to end_of_headers) and always set body_len to gfud->len - header_len (header_len should always be <= gfud->len)
* Fix a bug where if we used fetch url with include_headers=FALSE andMark Doliner2010-11-101-1/+1
| | | | | | then read() happens to read in the headers, the trailing \r\n\r\n and then one byte of the body (but no more) then we accidentally dropped the one byte off the start of the body.
* Correct typo in commentMark Doliner2010-11-101-2/+2
|
* g_hash_table_get_keys is GLIB>2.14.0 but we maintain compatibility with 2.12.0.Mark Doliner2010-11-101-0/+14
| | | | | | So implement a workaround. media.c also uses g_hash_table_get_keys, but I didn't change that one.
* g_strcmp0 was added in glib 2.16.0, but we keep compatibility with 2.12.Mark Doliner2010-11-101-0/+11
| | | | | Implement backward compatibility by basically implementing g_strcmp0 within this function
* merge of 'b5d95fcb40e109cf59628ce4baceb47a78b9fd11'Daniel Atallah2010-11-0814-124/+194
|\ | | | | | | and '19e343fc59ee43d76e066ac84d3c440da9c9403b'
| * merge of '3ba1162548bcb9204d7742c83f81257cb693ece0'Paul Aurich2010-11-0822-167/+242
| |\ | | | | | | | | | and '7c0e368414878c62f47a3bfb734a9742b1d1418b'
| | * merge of '7c9cabdaa68330083908cad821dbda84b2f50f7e'Elliott Sales de Andrade2010-11-067-68/+34
| | |\ | | | | | | | | | | | | and '1ac159463a0d34c07b3fec773b65bd0027fad885'
| | | * slpcall is never NULL here.Elliott Sales de Andrade2010-11-061-4/+2
| | | |
| | | * first can be NULL here, obviously, We don't want any NULL-pointerElliott Sales de Andrade2010-11-061-27/+29
| | | | | | | | | | | | | | | | dereferences.
| | | * Fix possible uninitialized value.Elliott Sales de Andrade2010-11-041-1/+1
| | | |
| | | * One more dead assignment.Elliott Sales de Andrade2010-11-041-4/+0
| | | |