summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge of '8482365bb2ecec16d6e7161069a6000c330727e8'cpw.darkrain42.xmpp.boshPaul Aurich2009-04-283-42/+1
|\
| * disapproval of revision '4c95bdba56270f9cb28edb9e77e4cb8ea8d058a2'Paul Aurich2009-04-283-41/+1
* | Fix merging.Paul Aurich2009-04-282-7/+5
* | propagate from branch 'im.pidgin.pidgin' (head 36f75a1d52a6af5574bf847d60054a...Paul Aurich2009-04-2887-1197/+2825
|\ \
| * | Don't try to process PEP events if it's not <message type='event'/>Paul Aurich2009-04-281-1/+6
| * | Distinguish name and participant in PurpleMedia APIPaul Aurich2009-04-272-27/+32
| * | Provide alternative find_by_jid that doesn't use g_hash_table_findPaul Aurich2009-04-271-2/+49
| * | merge of '3bc98c0344d6c60bb84054469918e06b1f33b9e7'Paul Aurich2009-04-273-12/+14
| |\ \
| | * \ merge of '3e6631a463daaf72e83d934b4f0f28f0c5e78d36'Sadrul Habib Chowdhury2009-04-271-2/+4
| | |\ \
| | | * | We probably shouldn't have to set the pixbuf and the stock-id, but anyway,Elliott Sales de Andrade2009-04-271-2/+4
| | * | | correctly use some text marked by N_(), and mark one more string asKa-Hing Cheung2009-04-272-10/+10
| | |/ /
| * | | Don't call jabber_parser_close_stream in jabber_close, it papers over a real ...Paul Aurich2009-04-271-10/+5
| * | | Changelog that branch and fix period placement.Paul Aurich2009-04-271-2/+3
| * | | propagate from branch 'im.pidgin.pidgin' (head eb45f24bb31cd01f715bad9f8804bc...Paul Aurich2009-04-2712-282/+533
| |\ \ \
| | * | | Publish only 'new' xmlns of avatars and delete old.cpw.darkrain42.xmpp.avatarsPaul Aurich2009-04-275-103/+79
| | * | | Another annoying typoPaul Aurich2009-04-271-1/+1
| | * | | Use jabber_calculate_data_sha1sum in one more place.Paul Aurich2009-04-261-11/+5
| | * | | Use purple_strequal and g_str_equalPaul Aurich2009-04-262-17/+15
| | * | | propagate from branch 'im.pidgin.pidgin' (head a495982a23a92e75616731c8f41a2b...Paul Aurich2009-04-2611-269/+552
| | |\ \ \ | | | |/ / | | |/| |
| | | * | propagate from branch 'im.pidgin.pidgin' (head ff10d01acbb3cefe4b9ff7d849b9af...Paul Aurich2009-04-2611-264/+548
| | | |\ \
| | | | * \ propagate from branch 'im.pidgin.pidgin' (head eef9f07b6874f793578cc5fd7ad010...Paul Aurich2009-04-1811-264/+548
| | | | |\ \
| | | | | * \ propagate from branch 'im.pidgin.pidgin' (head f9faf7492ad70e82cde607c3345d73...Paul Aurich2009-04-1111-264/+548
| | | | | |\ \
| | | | | | * | Drop a variable left over from the propagate.Paul Aurich2009-04-051-1/+0
| | | | | | * | propagate from branch 'im.pidgin.pidgin' (head beb862745aa7b61bf9942e731fdef0...Paul Aurich2009-04-0511-263/+548
| | | | | | |\ \
| | | | | | | * \ propagate from branch 'im.pidgin.pidgin' (head ebd21e9c68c5106f884f64e8824e97...Paul Aurich2009-04-0311-264/+546
| | | | | | | |\ \
| | | | | | | | * \ propagate from branch 'im.pidgin.pidgin' (head a1417d5cdedbe39c829e0342c2eded...Paul Aurich2009-03-2711-264/+546
| | | | | | | | |\ \
| | | | | | | | | * \ propagate from branch 'im.pidgin.pidgin' (head 3820f77c89fa10a7a53827f4bb1bf5...Paul Aurich2009-03-2111-264/+546
| | | | | | | | | |\ \
| | | | | | | | | | * \ propagate from branch 'im.pidgin.pidgin' (head b4bbfacd7f2050d87deeda12ea7bb3...Paul Aurich2009-03-0711-264/+546
| | | | | | | | | | |\ \
| | | | | | | | | | | * | Use a JabberStream variable instead of a setting for the initial hashPaul Aurich2009-02-144-19/+21
| | | | | | | | | | | * | Always publish a <photo/> element, even if we have an empty buddy icon.Paul Aurich2009-02-142-4/+18
| | | | | | | | | | | * | I had the distinct pleasure of throwing invalid garbage at this code; itPaul Aurich2009-02-141-1/+11
| | | | | | | | | | | * | propagate from branch 'im.pidgin.pidgin' (head 9cec90116395a424243dc04f682da4...Paul Aurich2009-02-059-262/+517
| | | | | | | | | | | |\ \
| | | | | | | | | | | | * | My lousy typo just consumed 20 minutes of my life. 'metadata', not 'metdata'.Paul Aurich2009-01-301-1/+1
| | | | | | | | | | | | * | propagate from branch 'im.pidgin.pidgin' (head 1b82a0195ff53914526e1be4ca8ca6...Paul Aurich2009-01-3046-420/+740
| | | | | | | | | | | | |\ \
| | | | | | | | | | | | * | | Whitespace changesPaul Aurich2009-01-261-7/+7
| | | | | | | | | | | | * | | Support both XEP-0084 namespaces for fetching our own avatars at loginPaul Aurich2009-01-263-74/+105
| | | | | | | | | | | | * | | Support XEP-0084 (User Avatar) v1.1 alongside v0.12Paul Aurich2009-01-263-25/+88
| | | | | | | | | | | | * | | Send presence updates from jabber_set_info, not jabber_set_buddy_icon.Paul Aurich2009-01-211-8/+5
| | | | | | | | | | | | * | | Only (re)publish XMPP avatars at login if the server's avatar differsPaul Aurich2009-01-215-13/+85
| | | | | | | | | | | | * | | Don't leak a JabberBuddyAvatarUpdateURLInfo struct in the error casePaul Aurich2009-01-211-1/+3
| | | | | | | | | | | | * | | Migrate the XMPP User Avatar (XEP-0084) code to its own filePaul Aurich2009-01-217-240/+330
| * | | | | | | | | | | | | | Initialize js->old_length to the value used as a default in presence.c.Paul Aurich2009-04-271-1/+1
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | merge of '3b5b1996c564c71483681fa32706211154ec38b0'Paul Aurich2009-04-2610-90/+231
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Update stuff for darkrain42 and Maiku to reflect them as developers.John Bailey2009-04-263-1/+7
| | * | | | | | | | | | | | | Changelog support for XMPP idle time (XEP-0256)Marcus Lundblad2009-04-261-0/+1
| | * | | | | | | | | | | | | propagate from branch 'im.pidgin.pidgin' (head ff10d01acbb3cefe4b9ff7d849b9af...Marcus Lundblad2009-04-266-89/+223
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | propagate from branch 'im.pidgin.pidgin' (head 993d20e63dabb19d9a2d8c84e2618e...cpw.malu.xmpp.idleMarcus Lundblad2009-04-2234-199/+409
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ propagate from branch 'im.pidgin.pidgin' (head b317b69b7434c249de3214c8c3b35d...Marcus Lundblad2009-04-13100-568/+1385
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ propagate from branch 'im.pidgin.pidgin' (head 1a0c8298eba4353493067c53b1fd74...Marcus Lundblad2009-04-076-89/+223
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ propagate from branch 'im.pidgin.pidgin' (head c0ec4f7d8515d6623abc695eab4936...Marcus Lundblad2009-04-0487-79/+12644
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \