pidgin/ljfisher-ssl-client-auth

propagate from branch 'im.pidgin.pidgin' (head 3fca1c28a0756561eb81e06407ba4df9dc9ef878)
mxit
2011-01-07, Andrew Victor
71bf9c688f3e
Parents 3fca1c28a075f1621856288d
Children cf74b88370ea
propagate from branch 'im.pidgin.pidgin' (head 3fca1c28a0756561eb81e06407ba4df9dc9ef878)
to branch 'im.pidgin.pidgin.mxit' (head f1621856288d473c06679a56a2e69c2e518ec0a8)
2 files changed, 40 insertions(+), 1 deletions(-)
  • +6 -0
    libpurple/protocols/mxit/login.c
  • +34 -1
    libpurple/protocols/mxit/mxit.c
    • --- a/libpurple/protocols/mxit/login.c Fri Jan 07 11:42:13 2011 +0000
    +++ b/libpurple/protocols/mxit/login.c Fri Jan 07 19:56:19 2011 +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 Fri Jan 07 11:42:13 2011 +0000
    +++ b/libpurple/protocols/mxit/mxit.c Fri Jan 07 19:56:19 2011 +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;
    }