Mercurial > pidgin
changeset 31291:b9dc45392feb
propagate from branch 'im.pidgin.pidgin' (head 665e2d641cdd2b6cca3bca378641f8345572146f)
to branch 'im.pidgin.pidgin.mxit' (head 20a7b36a8dc242edd143675b69a3e2864a11afbe)
| author | pieter.loubser@mxit.com |
|---|---|
| date | Wed, 15 Sep 2010 08:28:39 +0000 |
| parents | 581a070c3737 (diff) 1d55c7e1006e (current diff) |
| children | 754459ff7b23 |
| files | ChangeLog libpurple/protocols/jabber/google.c libpurple/protocols/jabber/google.h pidgin/pixmaps/emotes/small/16/cool.png pidgin/pixmaps/emotes/small/16/grin.png pidgin/win32/IdleTracker/Makefile.mingw pidgin/win32/IdleTracker/idletrack.c pidgin/win32/IdleTracker/idletrack.h |
| diffstat | 3 files changed, 57 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Sep 13 18:33:09 2010 +0000 +++ b/ChangeLog Wed Sep 15 08:28:39 2010 +0000 @@ -106,6 +106,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/login.c Mon Sep 13 18:33:09 2010 +0000 +++ b/libpurple/protocols/mxit/login.c Wed Sep 15 08:28:39 2010 +0000 @@ -762,6 +762,12 @@ { purple_debug_info( MXIT_PLUGIN_ID, "mxit_reconnect\n" ); + /* remove the input cb function */ + if ( session->con->inpa ) { + purple_input_remove( session->con->inpa ); + session->con->inpa = 0; + } + /* close existing connection */ session->flags &= ~MXIT_FLAG_CONNECTED; purple_proxy_connect_cancel_with_handle( session->con );
--- a/libpurple/protocols/mxit/mxit.c Mon Sep 13 18:33:09 2010 +0000 +++ b/libpurple/protocols/mxit/mxit.c Wed Sep 15 08:28:39 2010 +0000 @@ -588,7 +588,33 @@ /*------------------------------------------------------------------------ - * Buddy list menu. + * Re-Invite was selected from the buddy-list menu. + * + * @param node The entry in the buddy list. + * @param ignored (not used) + */ +static void mxit_reinvite( PurpleBlistNode *node, gpointer ignored ) +{ + PurpleBuddy* buddy; + struct contact* contact; + PurpleConnection* gc; + struct MXitSession* session; + + buddy = (PurpleBuddy *)node; + gc = purple_account_get_connection( purple_buddy_get_account( buddy ) ); + session = gc->proto_data; + + contact = purple_buddy_get_protocol_data( (PurpleBuddy*) node ); + if ( !contact ) + return; + + /* send a new invite */ + mxit_send_invite( session, contact->username, contact->alias, contact->groupname ); +} + + +/*------------------------------------------------------------------------ + * Buddy-list menu. * * @param node The entry in the buddy list. */ @@ -597,6 +623,7 @@ PurpleBuddy* buddy; struct contact* contact; GList* m = NULL; + PurpleMenuAction* act; if ( !PURPLE_BLIST_NODE_IS_BUDDY( node ) ) return NULL; @@ -606,6 +633,12 @@ if ( !contact ) return NULL; + if ( ( contact->subtype == MXIT_SUBTYPE_DELETED ) || ( contact->subtype == MXIT_SUBTYPE_REJECTED ) || ( contact->subtype == MXIT_SUBTYPE_NONE ) ) { + /* contact is in Deleted, Rejected or None state */ + act = purple_menu_action_new( _( "Re-Invite" ), PURPLE_CALLBACK( mxit_reinvite ), NULL, NULL ); + m = g_list_append(m, act); + } + return m; }