summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* propagate from branch 'im.pidgin.pidgin' (head 9b63613e82ab34b4b7315c801c636c...xmpp.custom_smileyMarcus Lundblad2008-09-171-26/+27
|\
| * Fix DNS resolution. I think I broke this this morning in my revisionMark Doliner2008-09-161-3/+5
| * There was a little weirdness with the code that called the UI functionMark Doliner2008-09-161-7/+6
| * Simplify two bits of code a littleMark Doliner2008-09-161-5/+2
| * Change a string to be more user friendly (people shouldn't have any ideaMark Doliner2008-09-161-1/+1
| * Improve a few commentsMark Doliner2008-09-161-10/+13
* | merge of '538a72dda9c11907fd17a7c7a59b07bdd0edee63'Marcus Lundblad2008-09-17499-9426/+2774
|\ \
| * \ propagate from branch 'im.pidgin.pidgin' (head b2b1a42a78168eb8f19ba3398c0058...Marcus Lundblad2008-09-1613-15/+895
| |\ \ | | |/ | |/|
| * | Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, whichMark Doliner2008-09-161-0/+17
| * | Don't use g_queue_get_length because it requires glib 2.4Mark Doliner2008-09-161-2/+2
| * | Some minor cleanup; removal of unnecessary frees and setting stuff to NULLDaniel Atallah2008-09-161-7/+11
| * | Fix a double free. Fixes #7047Stu Tomlinson2008-09-161-5/+9
| * | merge of 'd01a6b8ccfad536e692fa159a02583625596c4f5'Daniel Atallah2008-09-15779-154596/+82622
| |\ \
| | * \ merge of 'aa3947bf4a6a68df6600649c27a6988885500611'Daniel Atallah2008-09-15443-7520/+262
| | |\ \
| | | * \ merge of 'f2db327452421d946840bcb4ec8ca2e34268ac43'Daniel Atallah2008-09-1520-302/+121
| | | |\ \
| | | | * | disapproval of revision 'af1ac5f7ced8fda08c9ade37c9f46a4b33dabaf2'Daniel Atallah2008-09-1520-302/+121
| | | * | | merge of '733da35e0c7c70838a007c5ff9dc1f1175e8c003'Daniel Atallah2008-09-15443-7520/+262
| | | |\ \ \
| | | | * \ \ merge of '3fe8ef8a8c3845424f4e277374cb61a98c22734f'Daniel Atallah2008-09-15443-7520/+262
| | | | |\ \ \
| | | | | * | | Fix handling mouse events with menus.Sadrul Habib Chowdhury2008-09-131-3/+5
| | | | | * | | Richard failed to apply this change to the currently released versionKevin Stange2008-09-121-3/+1
| | | | | * | | merge of 'a290570bded27015ca39d2352cb14e3f82aef291'SHiNE CsyFeK2008-09-1246-1837/+2462
| | | | | |\ \ \
| | | | | * | | | Add support for printing out the TEXT-MESSAGE in SOCKS5 CHAP auth.Daniel Atallah2008-09-111-0/+5
| | | | | * | | | Fix the SOCKS5 CHAP authentication to parse several messages if they are read atDaniel Atallah2008-09-111-49/+96
| | | | | * | | | merge of 'df840f218c78c59b715e403529669d7284af8f54'Daniel Atallah2008-09-114-9/+1
| | | | | |\ \ \ \
| | | | | | * \ \ \ merge of '40e5fd4b38164faa882c14410fa2c0fe2c2091f3'Richard Laager2008-09-11436-7457/+127
| | | | | | |\ \ \ \
| | | | | | * | | | | Remove the preference for keeping the status message, and keep it always.Richard Laager2008-09-112-1/+1
| | | | | | * | | | | merge of 'ff4a5bfdab7f76666678452b11e0dbc243459ab1'Richard Laager2008-09-113-63/+20
| | | | | | |\ \ \ \ \
| | | | | | * | | | | | disapproval of revision '3ddbca0498b2774da7d7321895e19521d667cffa'Richard Laager2008-09-113-9/+1
| | | | | * | | | | | | Add GPL headers to the yahoo_auth files based on Sean's recollection of commu...Daniel Atallah2008-09-112-2/+30
| | | | | | |_|/ / / / | | | | | |/| | | | |
| | | | | * | | | | | merge of 'cdb6833e76ddea44f1ed2c65d79917baedc6cd74'Kevin Stange2008-09-112-27/+10
| | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ merge of '84b2d49304eef8252b919b6daa47d06c4a4ee4f8'Kevin Stange2008-09-11435-7457/+115
| | | | | | |\ \ \ \ \ \ | | | | | | | |_|/ / / / | | | | | | |/| | | | |
| | | | | * | | | | | | Add things to the ChangeLog. Please add things to the changelog whenKevin Stange2008-09-111-0/+12
| | | | | | |/ / / / / | | | | | |/| | | | |
| | | | | * | | | | | merge of '91dc48a14f59c0bf80cb18bd6e79c65ae62c7266'Kevin Stange2008-09-1132-224/+1281
| | | | | |\ \ \ \ \ \
| | | | | * | | | | | | disapproval of revision '376c2d213eb19f5b327affc2da40347a49f28906'Kevin Stange2008-09-11436-7493/+125
| | | | * | | | | | | | disapproval of revision 'a290570bded27015ca39d2352cb14e3f82aef291'Daniel Atallah2008-09-1513-86/+32
| | | | | |_|_|_|/ / / | | | | |/| | | | | |
| | | | * | | | | | | 2008.09.11 - csyfek <csyfek(at)gmail.com>SHiNE CsyFeK2008-09-1113-32/+86
| | | * | | | | | | | disapproval of revision '0130b3e3ba4cace2adbb41b74bc9c94947bd4ea1'Daniel Atallah2008-09-1518-208/+135
| | | |/ / / / / / /
| | | * | | | | | | 2008.09.04 - ccpaging <ccpaging(at)gmail.com>SHiNE CsyFeK2008-09-1118-135/+208
| | | | |_|_|_|/ / | | | |/| | | | |
| | | * | | | | | 2008.09.02 - ccpaging <ccpaging(at)gmail.com>SHiNE CsyFeK2008-09-1120-121/+302
| | * | | | | | | disapproval of revision 'b3ebedfac7cbad2b4bdd322c45aa572c3cd2795b'Daniel Atallah2008-09-1545-2130/+1813
| | |/ / / / / /
| | * | | | | | 2008.08.16 - ccpaging <ecc_hy(at)hotmail.com>SHiNE CsyFeK2008-09-1145-1813/+2130
| | | |_|/ / / | | |/| | | |
| | * | | | | shuffle some code around to make sure are using the right errno,Ka-Hing Cheung2008-09-111-2/+5
| | * | | | | merge of 'a2e8d72efd3416d5a4f8015ac667cd2a0ce86c40'Mark Doliner2008-09-106-37/+23
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Revert this change that was accidentally committed in f5ca7968 to removeKevin Stange2008-09-101-36/+10
| | | | |/ / | | | |/| |
| | | * | | Provide a preference to allow users to keep their status message whenRichard Laager2008-09-103-1/+9
| | | * | | Add some missing files to POTFILES.in.Richard Laager2008-09-101-0/+3
| | | * | | Add libpurple/tests/libpurple.. to the list of files to ignore. I don'tRichard Laager2008-09-101-0/+1
| | * | | | Fix this g_return_val_if_fail. It should have been returning TRUE orMark Doliner2008-09-101-3/+8
| | * | | | In our child DNS lookup processes, don't bother to use select to watchMark Doliner2008-09-101-10/+0
| | * | | | Currently when a child dns resolver process reads a domain name fromMark Doliner2008-09-101-15/+0
| | |/ / /