Mercurial > pidgin.yaz
changeset 31742:06371b61a840
merge of '705102c98a26efd83c13599fde9ff5e8635ca0e8'
and '839e701f0bed423381c8148bce912f6f0b614854'
| author | andrew.victor@mxit.com |
|---|---|
| date | Thu, 13 Jan 2011 07:21:13 +0000 |
| parents | 15e4b095adff (current diff) 754459ff7b23 (diff) |
| children | 121ebd2eaea3 |
| files | ChangeLog libpurple/protocols/msn/dialog.c libpurple/protocols/msn/dialog.h libpurple/protocols/msn/sync.c libpurple/protocols/msn/sync.h libpurple/protocols/mxit/chunk.c libpurple/protocols/mxit/login.c libpurple/protocols/mxit/protocol.c |
| diffstat | 5 files changed, 57 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jan 10 11:57:34 2011 +0000 +++ b/ChangeLog Thu Jan 13 07:21:13 2011 +0000 @@ -268,6 +268,40 @@ * Bonjour support now requires Apple Bonjour Print Services version 2.0.0 or newer (http://support.apple.com/kb/dl999). + libpurple: + * Fall back to an ordinary request if a UI does not support showing a + request with an icon. Fixes receiving MSN file transfer requests + including a thumbnail in Finch. + + Pidgin: + * Add support for the Gadu-Gadu protocol in the gevolution plugin to + provide Evolution integration with contacts with GG IDs. (#10709) + * Remap the "Set User Mood" shortcut to Control-D, which does not + conflict with the previous shortcut for Get Buddy Info on the + selected buddy. + * Add a plugin action menu (under Tools) for the Voice and Video + Settings plugin. + + Finch: + * Add support for drop-down account options (like the SILC cipher + and HMAC options or the QQ protocol version). + + XMPP: + * Unify the connection security-related settings into one dropdown. + * Fix a crash when multiple accounts are simultaneously performing + SASL authentication when built with Cyrus SASL support. (thanks + to Jan Kaluza) (#11560) + * Restore the ability to connect to XMPP servers that do not offer + Stream ID. (#12331) + * Added support for using Google's relay servers when making voice and + video calls to Google clients. + + Yahoo/Yahoo JAPAN: + * Stop doing unnecessary lookups of certain alias information. This + solves deadlocks when a given Yahoo account has a ridiculously large + (>500 buddies) list and may improve login speed for those on slow + connections. (#12532) + version 2.7.3 (08/10/2010): General: * Use silent build rules for automake >1.11. You can enable verbose @@ -336,6 +370,23 @@ * Fix file transfers that get stuck with "Waiting for transfer to begin". + MXit: + * Fix filename for the Shocked emoticon. (#12364) + * Implement the new naming conventions where possible. (MXitId, etc) + * Display a message in the Groupchat window when you invite somebody. + * Birthday field in profile cannot be edited when server says it is + locked. + * If a buddy is offline, show in their profile when last they were online. + * Handle pushed profile update packets (ie, when changing your avatar via + the Gallery bot). + * If a buddy is offline and we see from their profile that they have + updated their avatar, request the new avatar image from the server. + * Fix a possible crash if a link is clicked while disconnected. + * Unescape any escaped characters in a chatroom nickname. + * Add the new MXit moods and emoticons. + * MXit emoticons added to the small emoticon theme. + * Ability to re-invite a contact in Rejected or Deleted state. + version 2.7.2 (07/21/2010): AIM and ICQ: * Fix a crash bug related to X-Status messages that can be triggered by
--- a/libpurple/protocols/mxit/chunk.c Mon Jan 10 11:57:34 2011 +0000 +++ b/libpurple/protocols/mxit/chunk.c Thu Jan 13 07:21:13 2011 +0000 @@ -406,10 +406,9 @@ * @param chunkdata Chunked-data buffer * @param mxitId The username who's avatar to download * @param avatarId The Id of the avatar image (as string) - * @param imgsize The resolution of the avatar image * @return The number of bytes encoded in the buffer */ -int mxit_chunk_create_get_avatar( char* chunkdata, const char* mxitId, const char* avatarId, unsigned int imgsize ) +int mxit_chunk_create_get_avatar( char* chunkdata, const char* mxitId, const char* avatarId ) { int pos = 0; @@ -432,7 +431,7 @@ pos += add_int16( &chunkdata[pos], 1 ); /* image size [4 bytes] */ - pos += add_int32( &chunkdata[pos], imgsize ); + pos += add_int32( &chunkdata[pos], MXIT_AVATAR_SIZE ); return pos; }
--- a/libpurple/protocols/mxit/chunk.h Mon Jan 10 11:57:34 2011 +0000 +++ b/libpurple/protocols/mxit/chunk.h Thu Jan 13 07:21:13 2011 +0000 @@ -152,7 +152,7 @@ int mxit_chunk_create_get( char* chunkdata, const char* fileid, int filesize, int offset ); int mxit_chunk_create_received( char* chunkdata, const char* fileid, unsigned char status ); int mxit_chunk_create_set_avatar( char* chunkdata, const unsigned char* data, int datalen ); -int mxit_chunk_create_get_avatar( char* chunkdata, const char* mxitId, const char* avatarId, unsigned int imgsize ); +int mxit_chunk_create_get_avatar( char* chunkdata, const char* mxitId, const char* avatarId ); /* Decode chunk */ void mxit_chunk_parse_offer( char* chunkdata, int datalen, struct offerfile_chunk* offer );
--- a/libpurple/protocols/mxit/login.c Mon Jan 10 11:57:34 2011 +0000 +++ b/libpurple/protocols/mxit/login.c Thu Jan 13 07:21:13 2011 +0000 @@ -141,9 +141,10 @@ } /* This timer might already exist if we're registering a new account */ - if ( session->q_timer == 0 ) + if ( session->q_timer == 0 ) { /* start the tx queue manager timer */ session->q_timer = purple_timeout_add_seconds( 2, mxit_manage_queue, session ); + } }
--- a/libpurple/protocols/mxit/protocol.c Mon Jan 10 11:57:34 2011 +0000 +++ b/libpurple/protocols/mxit/protocol.c Thu Jan 13 07:21:13 2011 +0000 @@ -1343,7 +1343,7 @@ /* map chunk header over data buffer */ chunk = &data[datalen]; - size = mxit_chunk_create_get_avatar( chunk_data(chunk), mxitId, avatarId, MXIT_AVATAR_SIZE ); + size = mxit_chunk_create_get_avatar( chunk_data(chunk), mxitId, avatarId ); if ( size < 0 ) { purple_debug_error( MXIT_PLUGIN_ID, "Error creating get avatar chunk (%i)\n", size ); return;